updated workflow for dmgs

Author: scriptingosx

quickpkg

@@ -47,8 +47,8 @@ def getFirstPlist(textString):
     more text-style plists.
     Returns a tuple - the first plist (if any) and the remaining
     string after the plist"""
-    plist_header = '<?xml version'
-    plist_footer = '</plist>'
+    plist_header = b"<?xml version"
+    plist_footer = b"</plist>"
     plist_start_index = textString.find(plist_header)
     if plist_start_index == -1:
         # not found
@@ -72,7 +72,7 @@ def dmg_has_sla(dmgpath):
         print("error getting imageinfo! %s, %s" % (result["return_code"], result["stderr"]))
         return False
     result_plist = result["stdout"]
-    imageinfo_dict = readPlistFromString(result_plist)
+    imageinfo_dict = plistlib.loads(result_plist)
     properties = imageinfo_dict.get('Properties')
     if properties is not None:
         has_sla = properties.get('Software License Agreement', False)
@@ -86,7 +86,7 @@ def attachdmg(dmgpath):
     if info_result["return_code"] == 0:
         # parse the plist output
         (theplist, alltext) = getFirstPlist(info_result["stdout"])
-        info_dict = readPlistFromString(theplist)
+        info_dict = plistlib.loads(theplist)
         volpaths = []
         if "images" in list(info_dict.keys()):
             for y in info_dict["images"]:
@@ -118,7 +118,7 @@ def attachdmg(dmgpath):
     if result["return_code"] == 0:
         # parse the plist output
         (theplist, alltext) = getFirstPlist(result["stdout"])
-        resultdict = readPlistFromString(theplist)
+        resultdict = plistlib.loads(theplist)
         volpaths = []
         for x in resultdict["system-entities"]:
             if x["potentially-mountable"]: