From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58166138350 for ; Fri, 10 Apr 2020 05:38:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 415A4E088A; Fri, 10 Apr 2020 05:38:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 284EAE088A for ; Fri, 10 Apr 2020 05:38:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EAD4C34EF94 for ; Fri, 10 Apr 2020 05:38:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8ACD99C for ; Fri, 10 Apr 2020 05:38:25 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1586497026.4b430dc36fdb7fdecb768f617b67fab1baacb9cd.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 4b430dc36fdb7fdecb768f617b67fab1baacb9cd X-VCS-Branch: master Date: Fri, 10 Apr 2020 05:38:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e9d26d10-e847-49e1-b975-ef207a6caf11 X-Archives-Hash: c8288283ba3b198327450c2dc1de7aac commit: 4b430dc36fdb7fdecb768f617b67fab1baacb9cd Author: Matt Turner gentoo org> AuthorDate: Fri Apr 10 05:35:35 2020 +0000 Commit: Matt Turner gentoo 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 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.')