Merge branch 'Munki3dev' of https://github.com/munki/munki into Munki3dev

code/client/munkilib/installer/core.py

@@ -404,6 +404,11 @@ def install_with_info(
                     foundagain = True
                     break
 
+        # check to see if the item is both precache and OnDemand
+        if not foundagain and item.get('precache') and item.get('OnDemand'):
+            foundagain = True
+            break
+
         # need to check skipped_installs as well
         if not foundagain:
             for skipped_item in skipped_installs:

code/client/munkilib/updatecheck/analyze.py

@@ -487,7 +487,8 @@ def process_install(manifestitem, cataloglist, installinfo,
                              'icon_name',
                              'PayloadIdentifier',
                              'icon_hash',
-                             'OnDemand']
+                             'OnDemand',
+                             'precache']
 
             if (is_optional_install and
                     not installationstate.some_version_installed(item_pl)):