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 0968E138354 for ; Mon, 13 Apr 2020 20:36:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A449E0C4C; Mon, 13 Apr 2020 20:36:05 +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 30431E0C4C for ; Mon, 13 Apr 2020 20:36:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4C69134F0F5 for ; Mon, 13 Apr 2020 20:36:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7CA7F1D7 for ; Mon, 13 Apr 2020 20:36:02 +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: <1586810135.36980e93e59ede79aa3ecbf72dfedfd2014d692b.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: 36980e93e59ede79aa3ecbf72dfedfd2014d692b X-VCS-Branch: master Date: Mon, 13 Apr 2020 20:36:02 +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: 531cd15f-e594-4bde-a70c-191b04dcca44 X-Archives-Hash: 78ddfad9049e4b2efd20d21ec1e7dc57 commit: 36980e93e59ede79aa3ecbf72dfedfd2014d692b Author: Matt Turner gentoo org> AuthorDate: Mon Apr 13 19:44:27 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Apr 13 20:35:35 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=36980e93 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 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..829f9fb7 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("--b2um") def kill_chroot_pids(self): log.info('Checking for processes running in chroot and killing them.')