mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-01 09:49:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added uninstaller_item_location check to makecatalogs

Browse Source
This commit is contained in:
Nick McSpadden
2015-03-13 12:12:32 -07:00
parent 8701bacf78
commit 2c140e915a
1 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/makecatalogs
+41
View File
@@ -234,6 +234,7 @@ def makecatalogs(repopath, options):
do_pkg_check = False
if pkginfo.get('PackageURL'):
do_pkg_check = False
if do_pkg_check:
if not 'installer_item_location' in pkginfo:
@@ -268,6 +269,46 @@ def makecatalogs(repopath, options):
exit_code = -1
continue
#uninstaller sanity checking
do_pkg_check = False
uninstaller_type = pkginfo.get('uninstall_method')
if uninstaller_type in ['AdobeCCPUninstaller']:
do_pkg_check = True
if do_pkg_check:
if not 'uninstaller_item_location' in pkginfo:
errors.append(
"WARNING: file %s is missing uninstaller_item_location"
% filepath[len(pkgsinfopath)+1:])
# Skip this pkginfo unless we're running with force flag
if not options.force:
exit_code = -1
continue
# Try to form a path and fail if the
# uninstaller_item_location is not a valid type
try:
uninstalleritempath = os.path.join(
repopath, "pkgs", pkginfo['uninstaller_item_location'])
except TypeError:
errors.append("WARNING: invalid uninstaller_item_location "
"in info file %s"
% filepath[len(pkgsinfopath)+1:])
exit_code = -1
continue
# Check if the uninstaller item actually exists
if not os.path.exists(uninstalleritempath):
errors.append("WARNING: Info file %s refers to "
"missing uninstaller item: %s" %
(filepath[len(pkgsinfopath)+1:],
pkginfo['uninstaller_item_location']))
# Skip this pkginfo unless we're running with force flag
if not options.force:
exit_code = -1
continue
catalogs['all'].append(pkginfo)
for catalogname in pkginfo.get("catalogs", []):
infofilename = filepath[len(pkgsinfopath)+1:]