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