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

Conflict resolution

Browse Source
This commit is contained in:
Greg Neagle
2011-12-22 09:30:49 -08:00
parent 03a6136ea0 6e9790c129
commit 50833869db
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/updatecheck.py
+9 -3
View File
@@ -1977,13 +1977,19 @@ def processRemoval(manifestitem, cataloglist, installinfo):
def getManifestData(manifestpath):
'''Reads a manifest file, returns a
dictionary-like object'''
'''Reads a manifest file, returns a dictionary-like object.'''
plist = {}
try:
plist = FoundationPlist.readPlist(manifestpath)
except FoundationPlist.NSPropertyListSerializationException:
munkicommon.display_error('Could not read plist %s' % manifestpath)
munkicommon.display_error('Could not read plist: %s', manifestpath)
if os.path.exists(manifestpath):
try:
os.unlink(manifestpath)
except OSError, e:
munkicommon.display_error('Failed to delete plist: %s', str(e))
else:
munkicommon.display_error('plist does not exist.')
return plist