Remove some believed-unnecessary calls to add_defaults(). options
authorCarl Hetherington <cth@carlh.net>
Wed, 17 Apr 2024 14:19:04 +0000 (16:19 +0200)
committerCarl Hetherington <cth@carlh.net>
Wed, 17 Apr 2024 14:19:04 +0000 (16:19 +0200)
cdist

diff --git a/cdist b/cdist
index c17c1dc86a28680f40cb49ceb63f085a8bd42bc1..1f4a643ee2d3fb380ed21f447e203e9f54201fef 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -459,9 +459,8 @@ class Target:
 
     def package(self, project, checkout, output_dir, options, notarize):
         tree = self.build(project, checkout, options, for_package=True)
-        tree.add_defaults(options)
-        p = self._cscript_package(tree, options)
-        self._copy_packages(tree, p, output_dir)
+        package = self._cscript_package(tree, options)
+        self._copy_packages(tree, packages, output_dir)
 
     def build(self, project, checkout, options, for_package=False):
         tree = globals.trees.get(project, checkout, self)
@@ -861,8 +860,6 @@ class OSXSingleTarget(OSXTarget):
 
     def package(self, project, checkout, output_dir, options, notarize):
         tree = self.build(project, checkout, options, for_package=True)
-        tree.add_defaults(options)
-
         super().package(project, checkout, output_dir, options, notarize)