Missing parameter in OS X path.
authorCarl Hetherington <cth@carlh.net>
Tue, 29 May 2018 11:40:20 +0000 (12:40 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 29 May 2018 11:40:20 +0000 (12:40 +0100)
cdist

diff --git a/cdist b/cdist
index c1a710bebb0e09c92bdce55caf8c33e753a99d58..aaebbfffb13c23aace5a06b19a12c534ccc5bdd3 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -642,7 +642,12 @@ class OSXUniversalTarget(OSXTarget):
 
         tree = globals.trees.get(project, checkout, self)
         with TreeDirectory(tree):
-            for p in tree.call('package', tree.version):
+            if len(inspect.getargspec(tree.cscript['package']).args) == 3:
+                packages = tree.call('package', tree.version, options)
+            else:
+                log("Deprecated cscript package() method with no options parameter")
+                packages = tree.call('package', tree.version)
+            for p in packages:
                 copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))
 
 class SourceTarget(Target):