mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-29 00:39:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't mark a managed_install as processed until we've successfully processed all dependencies and successfully downloaded the installer item

Browse Source
This commit is contained in:
Greg Neagle
2021-08-20 13:59:43 -07:00
parent 13e4d428bb
commit 0cd2f6875a
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/updatecheck/analyze.py
+8 -10
View File
@@ -326,16 +326,6 @@ def process_install(manifestitem, cataloglist, installinfo,
'Could not process item %s for install. No pkginfo found in '
'catalogs: %s ', manifestitem, ', '.join(cataloglist))
return False
elif is_managed_update:
# we're processing this as a managed update, so don't
# add it to the processed_installs list
pass
else:
# we found it, so add it to our list of processed installs
# so we don't process it again in the future
display.display_debug2(
'Adding %s to list of processed installs' % manifestitemname)
installinfo['processed_installs'].append(manifestitemname)
if item_in_installinfo(item_pl, installinfo['managed_installs'],
vers=item_pl.get('version')):
@@ -630,6 +620,14 @@ def process_install(manifestitem, cataloglist, installinfo,
update_item, cataloglist, installinfo,
is_managed_update=is_managed_update)
# done successfully processing this install; add it to our list
# of processed installs so we don't process it again in the future
# (unless it is a managed_update)
if not is_managed_update:
display.display_debug2(
'Adding %s to list of processed installs' % manifestitemname)
installinfo['processed_installs'].append(manifestitemname)
return True