| 1 |
commit: 9cfdfd6076471edbc422ba2e73dc103a93c9e917 |
| 2 |
Author: Michael Everitt <m.j.everitt <AT> iee <DOT> org> |
| 3 |
AuthorDate: Fri Sep 7 17:11:34 2018 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 1 16:21:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9cfdfd60 |
| 7 |
|
| 8 |
Update parsing of 'makeopts' in specs to permit multiple arguments |
| 9 |
|
| 10 |
edit by Brian Dolbec <dolsen <AT> gentoo.org>: |
| 11 |
Make elif an else so it will accept any iterable. |
| 12 |
|
| 13 |
catalyst/base/stagebase.py | 7 ++++++- |
| 14 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 17 |
index 6d78f937..7665834c 100644 |
| 18 |
--- a/catalyst/base/stagebase.py |
| 19 |
+++ b/catalyst/base/stagebase.py |
| 20 |
@@ -1420,7 +1420,12 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 21 |
self.env[varname] = "false" |
| 22 |
|
| 23 |
if "makeopts" in self.settings: |
| 24 |
- self.env["MAKEOPTS"] = self.settings["makeopts"] |
| 25 |
+ if isinstance(self.settings["makeopts"], str): |
| 26 |
+ self.env["MAKEOPTS"] = self.settings["makeopts"] |
| 27 |
+ else: |
| 28 |
+ # ensure makeopts is a string |
| 29 |
+ self.env["MAKEOPTS"] = ' '.join(self.settings["makeopts"]) |
| 30 |
+ |
| 31 |
log.debug('setup_environment(); env = %r', self.env) |
| 32 |
|
| 33 |
def run(self): |
Archives