diff options
| -rwxr-xr-x | cdist | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -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)) |