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

Merge branch 'master' into conditional-includes

Browse Source
This commit is contained in:
Greg Neagle
2011-11-22 10:19:48 -08:00
parent 7324c9da5c e7b2667874
commit e7a55f662e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/installer.py
+3 -2
View File
@@ -358,7 +358,8 @@ def copyFromDMG(dmgpath, itemlist):
destpath = item.get("destination_path")
if os.path.exists(destpath):
# remove item if it already exists
olditem = os.path.join(destpath, itemname)
olditem = os.path.join(destpath,
os.path.basename(itemname))
if os.path.exists(olditem):
retcode = subprocess.call(
["/bin/rm", "-rf", olditem])
@@ -474,7 +475,7 @@ def removeCopiedItems(itemlist):
munkicommon.display_error("Missing path for item to remove.")
retcode = -1
break
path_to_remove = os.path.join(destpath, itemname)
path_to_remove = os.path.join(destpath, os.path.basename(itemname))
if os.path.exists(path_to_remove):
munkicommon.display_status('Removing %s' % path_to_remove)
retcode = subprocess.call(['/bin/rm', '-rf', path_to_remove])