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

Fixed display of filesystem removal errors.

Browse Source 
Reordered operations so receipts will be removed even if no filesystem items are removed (like in payload-free packages).
Suppress warning when encountering bogus BSD.pkg

git-svn-id: http://munki.googlecode.com/svn/trunk@132 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2009-07-24 18:32:45 +00:00
parent 0d7c35646d
commit dca75a3b6c
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/removepackages.py
+26 -11
View File
@@ -197,7 +197,10 @@ def ImportPackage(packagepath, c):
return
if not os.path.isdir(packagepath):
munkicommon.display_error("%s is not a valid receipt. Skipping." % packagepath)
# Every machine I've seen has a bogus BSD.pkg, so we won't print a warning for
# that specific one.
if pkgname != "BSD.pkg":
munkicommon.display_error("%s is not a valid receipt. Skipping." % packagepath)
return
if not os.path.exists(bompath):
@@ -755,6 +758,8 @@ def removeFilesystemItems(removalpaths, forcedeletebundles):
ds_storepath = pathtoremove + "/.DS_Store"
try:
os.remove(ds_storepath)
except:
pass
diritems = os.listdir(pathtoremove)
if diritems == []:
# directory is empty
@@ -798,10 +803,10 @@ def removeFilesystemItems(removalpaths, forcedeletebundles):
local_display_percent_done(itemindex, itemcount)
if removalerrors:
display_info("---------------------------------------------------")
display_info("There were problems removing some filesystem items.")
display_info("---------------------------------------------------")
display_info(removalerrors)
munkicommon.display_info("---------------------------------------------------")
munkicommon.display_info("There were problems removing some filesystem items.")
munkicommon.display_info("---------------------------------------------------")
munkicommon.display_info(removalerrors)
@@ -834,17 +839,21 @@ def removepackages(pkgnames, forcedeletebundles=False, listfiles=False,
for item in removalpaths:
print "/" + item.encode("UTF-8")
else:
if munkicommon.munkistatusoutput:
munkistatus.disableStopButton()
removeFilesystemItems(removalpaths, forcedeletebundles)
if not noremovereceipts:
removeReceipts(pkgkeyslist, noupdateapplepkgdb)
if munkicommon.munkistatusoutput:
munkicommon.display_status('Package removal complete.')
time.sleep(2)
else:
munkicommon.display_status('Nothing to remove.')
if munkicommon.munkistatusoutput:
time.sleep(2)
if not listfiles:
if not noremovereceipts:
removeReceipts(pkgkeyslist, noupdateapplepkgdb)
if munkicommon.munkistatusoutput:
munkistatus.enableStopButton()
munkicommon.display_status('Package removal complete.')
time.sleep(2)
return 0
@@ -881,12 +890,18 @@ def main():
# set the munkicommon globals
munkicommon.munkistatusoutput = options.munkistatusoutput
munkicommon.verbose = options.verbose
if options.munkistatusoutput:
pkgcount = len(pkgnames)
munkistatus.message("Removing %s packages..." % pkgcount)
retcode = removepackages(pkgnames, forcedeletebundles=options.forcedeletebundles, listfiles=options.listfiles,
rebuildpkgdb=options.rebuildpkgdb, noremovereceipts=options.noremovereceipts,
noupdateapplepkgdb=options.noupdateapplepkgdb)
if options.munkistatusoutput:
munkistatus.quit()
exit(retcode)