commit: 8cf9e10774576c75777633e79bd2173c291e95cc
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 14:59:20 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 14:59:20 2016 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8cf9e107
stagebase.py: Add support for a single pkg to be listed in the specs
stage?/packages
The code previously only supported packages as a list, but teh spec parser
always makes a
single item into a string, only multiple entries were a list.
This allows the packages list to be either a single string or a list of strings.
catalyst/base/stagebase.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 6695ac4..904103f 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1473,14 +1473,18 @@ class StageBase(TargetBase, ClearBase, GenBase):
log.notice('Resume point detected, skipping
build_packages operation...')
else:
if self.settings["spec_prefix"]+"/packages" in
self.settings:
+ target_pkgs = self.settings["spec_prefix"] +
'/packages'
if "autoresume" in self.settings["options"] \
and
self.resume.is_enabled("build_packages"):
log.notice('Resume point detected,
skipping build_packages operation...')
else:
+ command =
[self.settings['controller_file'], 'build_packages']
+ if
isinstance(self.settings[target_pkgs], str):
+
command.append(self.settings[target_pkgs])
+ else:
+
command.extend(self.settings[target_pkgs])
try:
-
cmd([self.settings['controller_file'], 'build_packages'] +
-
self.settings[self.settings["spec_prefix"] + '/packages'],
- env=self.env)
+ cmd(command, env=self.env)
fileutils.touch(build_packages_resume)
self.resume.enable("build_packages")
except CatalystError:
