summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-11-07 00:33:22 +0100
committerCarl Hetherington <cth@carlh.net>2025-11-07 00:33:55 +0100
commitf383beec834dcf51dab5b9fdefccfefef6af5842 (patch)
treec04fc0f65212cefb3ca6add8e0aa2ccb90a4b881
parent158d75686cf7a1b0cef57f11e4f2e6056114e190 (diff)
Pass for_package correctly when building package dependencies.
-rwxr-xr-xcdist12
1 files changed, 7 insertions, 5 deletions
diff --git a/cdist b/cdist
index a52d9f7..acd3bef 100755
--- a/cdist
+++ b/cdist
@@ -420,7 +420,7 @@ class Target:
def build(self, project, checkout, options, for_package=False):
tree = globals.trees.get(project, checkout, self)
if self.build_dependencies:
- tree.build_dependencies(options)
+ tree.build_dependencies(options, for_package)
if not self.dependencies_only:
tree.build(options, for_package=for_package)
return tree
@@ -1118,15 +1118,15 @@ class Tree:
for i in self.dependencies(options):
pass
- def build_dependencies(self, options):
+ def build_dependencies(self, options, for_package):
"""
Called on the 'main' project tree (-p on the command line) to build all dependencies.
options: either from command line (for top-level tree) or from parent's dependencies() (for other trees)
"""
for dependency, dependency_options in self.dependencies(options):
- dependency.build(dependency_options)
+ dependency.build(dependency_options, for_package)
- def build(self, options, for_package=False):
+ def build(self, options, for_package):
"""
options: either from command line (for top-level tree) or from parent's dependencies() (for other trees)
"""
@@ -1139,7 +1139,9 @@ class Tree:
if not globals.dry_run:
num_args = len(inspect.getfullargspec(self.cscript['build']).args)
- if num_args == 3:
+ if num_args == 4:
+ self.call('build', self.add_defaults(options), for_package, self.version)
+ elif num_args == 3:
self.call('build', self.add_defaults(options), for_package)
elif num_args == 2:
self.call('build', self.add_defaults(options))