summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-04-17 16:19:04 +0200
committerCarl Hetherington <cth@carlh.net>2024-04-17 16:19:04 +0200
commitb73074bb3a579937e02949bb5829d2392cc67d5d (patch)
treecc4d88ce3df93772443ccf2bd7ac8c1131ab4e45
parent102700a293c04db762164310947ca28180b57a11 (diff)
Remove some believed-unnecessary calls to add_defaults().options
-rwxr-xr-xcdist7
1 files changed, 2 insertions, 5 deletions
diff --git a/cdist b/cdist
index c17c1dc..1f4a643 100755
--- 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)