[gentoo-commits] proj/catalyst:master commit in: catalyst/base/

[Brian Dolbec]

commit:     9cfdfd6076471edbc422ba2e73dc103a93c9e917
Author:     Michael Everitt <m.j.everitt <AT> iee <DOT> org>
AuthorDate: Fri Sep  7 17:11:34 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Oct  1 16:21:36 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9cfdfd60

Update parsing of 'makeopts' in specs to permit multiple arguments

edit by Brian Dolbec <dolsen <AT> gentoo.org>:
    Make elif an else so it will accept any iterable.

 catalyst/base/stagebase.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 6d78f937..7665834c 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1420,7 +1420,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
                                                        self.env[varname] = 
"false"
 
                if "makeopts" in self.settings:
-                       self.env["MAKEOPTS"] = self.settings["makeopts"]
+                       if isinstance(self.settings["makeopts"], str):
+                               self.env["MAKEOPTS"] = self.settings["makeopts"]
+                       else:
+                               # ensure makeopts is a string
+                               self.env["MAKEOPTS"] = ' 
'.join(self.settings["makeopts"])
+
                log.debug('setup_environment(); env = %r', self.env)
 
        def run(self):