summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-02-19 21:06:10 +0100
committerCarl Hetherington <cth@carlh.net>2022-02-19 21:06:10 +0100
commit0472bc3bab6557ff356b2cb313402b12b86c96e6 (patch)
tree829e48696fc0ab85a88437ab5c08989924d75cf7
parent1b9fcb5ab32d501a24f603d8a2e4fe8aff282e95 (diff)
Revert "Don't build a tree that is being packaged; the package() method must do it (if required)."
This reverts commit 1b9fcb5ab32d501a24f603d8a2e4fe8aff282e95. On reflection this approach just gets too complicated considering the override of package() for macOS.
-rwxr-xr-xcdist5
1 files changed, 1 insertions, 4 deletions
diff --git a/cdist b/cdist
index 9b164e7..cdc6acf 100755
--- a/cdist
+++ b/cdist
@@ -447,10 +447,7 @@ class Target(object):
copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.commit, p))))
def package(self, project, checkout, output_dir, options, notarize):
- # Build the dependencies; the cscript must call its own build() method if it needs to
- tree = globals.trees.get(project, checkout, self)
- if self.build_dependencies:
- tree.build_dependencies(options)
+ tree = self.build(project, checkout, options)
tree.add_defaults(options)
p = self._cscript_package(tree, options)
self._copy_packages(tree, p, output_dir)