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

[Matt Turner]

commit:     403ab9c13eda83e841316a15dff4877be4eda698
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 19:44:27 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 20:42:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=403ab9c1

catalyst: Fix appending --b2sum

... again. If gk_mainargs is set in the spec, then
self.settings[gk_mainargs] is an array, not a string, so adding a string
adds the individual characters as array elements. However, if
gk_mainargs is not set, then adding a string makes it a string and
everything works.

Fixes: 4b430dc36fdb (catalyst: Fix appending --b2sum)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/base/stagebase.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 6f0a1bc3..b4275355 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -676,8 +676,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
                verify = prefix + "/verify"
                if verify in self.settings:
                        assert self.settings[verify] == "blake2"
-                       self.settings.setdefault("gk_mainargs", "")
-                       self.settings["gk_mainargs"] += " --b2sum"
+                       self.settings.setdefault("gk_mainargs", 
[]).append("--b2sum")
 
        def kill_chroot_pids(self):
                log.info('Checking for processes running in chroot and killing 
them.')