More debugging of flaky xcrun altool.

[cdist.git] / cdist

diff --git a/cdist b/cdist
index ec1abb4519bf2d2e8c195e0af0566085899b7208..5abc82e501468e08f5ef34d1f3386296cd94d465 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -752,10 +752,11 @@ def notarize_dmg(dmg, bundle_id):
         raise Error('No RequestUUID found in response from Apple')
 
     for i in range(0, 30):
-        print('Checking up on %s' % request_uuid)
+        print('%s: checking up on %s' % (datetime.datetime.now(), request_uuid))
         p = subprocess.run(['xcrun', 'altool', '--notarization-info', request_uuid, '-u', config.get('apple_id'), '-p', config.get('apple_password'), '--output-format', 'xml'], capture_output=True)
+        print('%s: %s' % (datetime.datetime.now(), p))
         status = string_after(p, 'Status')
-        print('Got %s' % status)
+        print('Got status: %s' % status)
         if status == 'invalid':
             raise Error("Notarization failed")
         elif status == 'success':
@@ -916,6 +917,8 @@ def target_factory(args):
         target = LinuxTarget(s, None, None, args.work)
     elif s == 'osx':
         target = OSXUniversalTarget(args.work)
+    elif s == 'osx-intel':
+        target = OSXSingleTarget('x86_64', config.get('osx_sdk'), config.get('osx_intel_deployment'), args.work)
     elif s == 'source':
         target = SourceTarget()
     elif s == 'flatpak':