Fix previous.

diff --git a/cdist b/cdist
index f1322fb3cb1dde713049433abdaf2791874469a2..06a9cb30af71ba66ea0f7a34f739532a6a640df4 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -795,6 +795,13 @@ class OSXTarget(Target):
     def unlock_keychain(self):
         self.command('security unlock-keychain -p %s %s' % (self.osx_keychain_password, self.osx_keychain_file))
 
+    def _copy_packages(self, tree, packages, output_dir):
+        for p in packages:
+            dest = os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p)))
+            copyfile(p, dest)
+            if os.path.exists(p + ".id"):
+                copyfile(p + ".id", dest + ".id")
+
     def _cscript_package_and_notarize(self, tree, options, notarize):
         """
         Call package() in the cscript and notarize the .dmgs that are returned, if notarize == True
@@ -840,13 +847,6 @@ class OSXSingleTarget(OSXTarget):
         self.set('MACOSX_DEPLOYMENT_TARGET', self.deployment)
         self.set('CCACHE_BASEDIR', self.directory)
 
-    def _copy_packages(self, tree, packages, output_dir):
-        for p in packages:
-            dest = os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p)))
-            copyfile(p, dest)
-            if os.path.exists(p + ".id"):
-                copyfile(p + ".id", dest + ".id")
-
     @Target.ccache.setter
     def ccache(self, v):
         Target.ccache.fset(self, v)