fixup! Use notarytool instead of altool for notarizing macOS apps.

[cdist.git] / cdist

diff --git a/cdist b/cdist
index 3a7d4f01508dc3f31058fed416f6a26363d686a4..69c595c6d018aac59c9ccc5fed903ecefcebfa5f 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -762,19 +762,16 @@ def notarize_dmg(dmg):
     def string_after(process, key):
         lines = p.stdout.decode('utf-8').splitlines()
         for i in range(0, len(lines)):
-            if lines[i].find(key) != -1:
-                return lines[i+1].strip().replace('<string>', '').replace('</string>', '')
-
-    status = string_after(p, 'Status')
-    print('%s: got status %s' % (datetime.datetime.now(), status))
-    if status == 'invalid':
-        raise Error("Notarization failed")
-    elif status == 'success':
-        subprocess.run(['xcrun', 'stapler', 'staple', dmg])
-        return
-    elif status != "in progress":
+            if
+
+    last_line = p.stdout.decode('utf-8').splitlines()[-1].split()
+    if last_line != 'status: Accepted':
         print("Could not understand notarytool response")
         print(p)
+        print(f"Last line: {last_line}")
+        raise Error('Notarization failed')
+
+    subprocess.run(['xcrun', 'stapler', 'staple', dmg])
 
 
 class OSXTarget(Target):