commit: 4b430dc36fdb7fdecb768f617b67fab1baacb9cd
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 05:35:35 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 05:37:06 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4b430dc3
catalyst: Fix appending --b2sum
I fixed this locally on my testing machine and failed to sync the
changes back.
Fixes: c3b572d0ed5e (catalyst: Automatically specify --b2sum ...)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 00596264..72ef57d3 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -683,7 +683,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
verify = prefix + "/verify"
if verify in self.settings:
assert self.settings[verify] == "blake2"
- self.settings.setdefault("gk_mainargs", "").append("
--b2sum")
+ self.settings.setdefault("gk_mainargs", "")
+ self.settings["gk_mainargs"] += " --b2sum"
def kill_chroot_pids(self):
log.info('Checking for processes running in chroot and killing
them.')