From: Carl Hetherington <cth@carlh.net>
Date: Tue, 20 Oct 2020 19:07:53 +0000 (+0200)
Subject: Fix handling of notarization request.
X-Git-Url: https://git.carlh.net/gitweb/?p=cdist.git;a=commitdiff_plain;h=3298597f8f6998eed5cde549686bf78c84744bdb

Fix handling of notarization request.
---

diff --git a/cdist b/cdist
index 8ce2497..3bd001c 100755
--- a/cdist
+++ b/cdist
@@ -734,14 +734,13 @@ def notarize(dmg, bundle_id):
 
     def string_after(process, key):
         lines = p.stdout.decode('utf-8').splitlines()
-        request_uuid = None
         for i in range(0, len(lines)):
             if lines[i].find(key) != -1:
                 return lines[i+1].strip().replace('<string>', '').replace('</string>', '')
 
-        raise Error("Missing expected response %s from Apple" % key)
-
     request_uuid = string_after(p, "RequestUUID")
+    if request_uuid is None:
+        raise Error('No RequestUUID found in response from Apple')
 
     for i in range(0, 30):
         print('Checking up on %s' % request_uuid)