Adapt for changes to environment structure.

[cdist.git] / cdist

diff --git a/cdist b/cdist
index 8e0d52736e4cdee59d163ad50f7ba434423df842..c0ff509e6bb6abe521f8d1303d351bb7eb45c511 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -747,6 +747,7 @@ def notarize_dmg(dmg, bundle_id):
 
     request_uuid = string_after(p, "RequestUUID")
     if request_uuid is None:
+        print("Response: %s" % p)
         raise Error('No RequestUUID found in response from Apple')
 
     for i in range(0, 30):
@@ -803,8 +804,8 @@ class OSXSingleTarget(OSXTarget):
         self.sdk = sdk
 
         flags = '-isysroot %s/MacOSX%s.sdk -arch %s' % (self.sdk_prefix, sdk, arch)
-        host_enviro = '%s/x86_64/10.9' % config.get('osx_environment_prefix')
-        target_enviro = '%s/%s/%s' % (config.get('osx_environment_prefix'), arch, sdk)
+        host_enviro = '%s/x86_64' % config.get('osx_environment_prefix')
+        target_enviro = '%s/%s' % (config.get('osx_environment_prefix'), arch)
 
         self.bin = '%s/bin' % target_enviro
 
@@ -837,9 +838,11 @@ class OSXSingleTarget(OSXTarget):
 class OSXUniversalTarget(OSXTarget):
     def __init__(self, directory=None):
         super(OSXUniversalTarget, self).__init__(directory)
+        self.intel_sdk = config.get('osx_intel_sdk')
+        self.arm_sdk = config.get('osx_arm_sdk')
 
     def package(self, project, checkout, output_dir, options, notarize):
-        for arch, sdk in (('x86_64', config.get('osx_intel_sdk')), ('arm64', config.get('osx_arm_sdk'))):
+        for arch, sdk in (('x86_64', self.intel_sdk), ('arm64', self.arm_sdk)):
             target = OSXSingleTarget(arch, sdk, os.path.join(self.directory, arch))
             target.ccache = self.ccache
             tree = globals.trees.get(project, checkout, target)