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

Suppress warnings when we cannot remove an non-empty directory when that directory is inside a bundle and --forcedeletebundles is true.

Browse Source 
git-svn-id: http://munki.googlecode.com/svn/trunk@136 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2009-07-27 18:28:59 +00:00
parent 45663239e8
commit 8fc30b0f51
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/removepackages.py
+19 -3
View File
@@ -728,6 +728,18 @@ def isBundle(pathname):
return False
else:
return False
def insideBundle(pathname):
# check the path to see if it's inside a bundle
while len(pathname) > 1:
if isBundle(pathname):
return True
else:
# chop off last item in path
pathname = os.path.dirname(pathname)
#if we get here, we didn't find a bundle path
return False
def removeFilesystemItems(removalpaths, forcedeletebundles):
"""
@@ -781,9 +793,13 @@ def removeFilesystemItems(removalpaths, forcedeletebundles):
munkicommon.display_error(msg)
removalerrors = removalerrors + "/n" + msg
else:
msg = "WARNING: Did not remove %s because it is not empty." % pathtoremove
munkicommon.display_error(msg)
removalerrors = removalerrors + "/n" + msg
# if this path is inside a bundle, and we've been directed to force remove
# bundles, we don't need to warn because it's going to be removed with the
# bundle. Otherwise, we should warn about non-empty directories.
if not insideBundle(pathtoremove) or not forcedeletebundles:
msg = "WARNING: Did not remove %s because it is not empty." % pathtoremove
munkicommon.display_error(msg)
removalerrors = removalerrors + "/n" + msg
else:
# not a directory, just unlink it