mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-26 06:48:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Restore 'catalogs' as an item included in ManagedInstallReport.plist under 'Conditions'. Addresses #1218

Browse Source
This commit is contained in:
Greg Neagle
2024-06-04 13:39:24 -07:00
parent bb2d1e0ca2
commit 6c4a8bc29f
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/updatecheck/core.py
+11 -7
View File
@@ -114,13 +114,6 @@ def check(client_id='', localmanifestpath=None):
installinfo['managed_installs'] = []
installinfo['removals'] = []
# record info object for conditional item comparisons
reports.report['Conditions'] = {}
# copy everything except applications data
for key, value in info.predicate_info_object().items():
if key != 'applications':
reports.report['Conditions'][key] = value
# remove any staged os installer info we have; we'll check and
# recreate if still valid
osinstaller.remove_staged_os_installer_info()
@@ -378,6 +371,17 @@ def check(client_id='', localmanifestpath=None):
reports.report['ItemsToInstall'] = installinfo['managed_installs']
reports.report['ItemsToRemove'] = installinfo['removals']
# record info object for conditional item comparisons
reports.report['Conditions'] = {}
# copy everything except applications data
for key, value in info.predicate_info_object().items():
if key != 'applications':
reports.report['Conditions'][key] = value
# make sure recorded catalogs are those for the primary manifest
# as this list can change with included manifests
reports.report['Conditions']['catalogs'] = get_primary_manifest_catalogs(
client_id=client_id)
# clean up catalogs directory
catalogs.clean_up()