Fixes to OSX builds.
authorCarl Hetherington <cth@carlh.net>
Thu, 24 Jul 2014 09:32:27 +0000 (10:32 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 24 Jul 2014 09:32:27 +0000 (10:32 +0100)
cdist

diff --git a/cdist b/cdist
index b9f3bbcd910925e68956d03a8761c873aa0cd103..268a6f49f3d7f0d092000d6a8f56f3e69a3a9b29 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -395,8 +395,8 @@ class OSXUniversalTarget(OSXTarget):
     def __init__(self, directory=None):
         super(OSXUniversalTarget, self).__init__(directory)
         self.parts = []
-        self.parts.append(OSXSingleTarget(32, directory))
-        self.parts.append(OSXSingleTarget(64, directory))
+        self.parts.append(OSXSingleTarget(32, os.path.join(self.directory, '32')))
+        self.parts.append(OSXSingleTarget(64, os.path.join(self.directory, '64')))
 
     def package(self, project):
         for p in self.parts:
@@ -414,7 +414,6 @@ class OSXUniversalTarget(OSXTarget):
 class SourceTarget(Target):
     def __init__(self):
         super(SourceTarget, self).__init__('source', 2)
-        self.directory = tempfile.mkdtemp()
 
     def command(self, c):
         log('host -> %s' % c)