Cleanup: use _build_packages.
authorCarl Hetherington <cth@carlh.net>
Wed, 30 Dec 2020 00:31:15 +0000 (01:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 30 Dec 2020 00:31:15 +0000 (01:31 +0100)
cdist

diff --git a/cdist b/cdist
index f5c72497a6f490b85b04fef401ef544006398232..244d8f1eacb926be2b9c98a00bd3c35523c7bb6b 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -844,11 +844,7 @@ class OSXUniversalTarget(OSXTarget):
         self.unlock_keychain()
         tree = globals.trees.get(project, checkout, self)
         with TreeDirectory(tree):
-            if len(inspect.getfullargspec(tree.cscript['package']).args) == 3:
-                packages = tree.call('package', tree.version, options)
-            else:
-                log_normal("Deprecated cscript package() method with no options parameter")
-                packages = tree.call('package', tree.version)
+            self._build_packages(tree, options)
             for p in packages:
                 copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))