Merge branch 'master' into curl-refactor

code/client/munkilib/updatecheck.py

@@ -2479,10 +2479,21 @@ def check(client_id='', localmanifestpath=None):
         installinfochanged = True
         installinfopath = os.path.join(ManagedInstallDir, 'InstallInfo.plist')
         if os.path.exists(installinfopath):
-            oldinstallinfo = FoundationPlist.readPlist(installinfopath)
+            try:
+                oldinstallinfo = FoundationPlist.readPlist(installinfopath)
+            except FoundationPlist.NSPropertyListSerializationException:
+                oldinstallinfo = None
+                munkicommon.display_error(
+                    'Could not read InstallInfo.plist. Deleting...')
+                try:
+                    os.unlink(installinfopath)
+                except OSError, e:
+                    munkicommon.display_error(
+                        'Failed to delete InstallInfo.plist: %s', str(e))
             if oldinstallinfo == installinfo:
                 installinfochanged = False
                 munkicommon.display_detail('No change in InstallInfo.')
+
         if installinfochanged:
             FoundationPlist.writePlist(installinfo,
                                        os.path.join(ManagedInstallDir,

code/client/munkilib/utils.py

@@ -91,7 +91,7 @@ def verifyFileOnlyWritableByMunkiAndRoot(file_path):
             '%s is not secure! %s' % (file_path, e.args[0]))
 
 
-def runExternalScript(script, allow_insecure=False, script_args=[]):
+def runExternalScript(script, allow_insecure=False, script_args=()):
     """Run a script (e.g. preflight/postflight) and return its exit status.
 
     Args: