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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B780D158090 for ; Fri, 13 May 2022 17:43:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF677E0849; Fri, 13 May 2022 17:43:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4209E0849 for ; Fri, 13 May 2022 17:43:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA5B0341A79 for ; Fri, 13 May 2022 17:43:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C8FC464 for ; Fri, 13 May 2022 17:43:46 +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: <1652463761.430a699ca9262b25fea2e8e2f0ce4eea56e6c898.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:stage4-user-groups-fixes 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: 430a699ca9262b25fea2e8e2f0ce4eea56e6c898 X-VCS-Branch: stage4-user-groups-fixes Date: Fri, 13 May 2022 17:43:46 +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: 8e432cf5-a82c-4752-a189-5ddbbd9234f7 X-Archives-Hash: fc8908178efe30c3cee9e0f6bf60904f Message-ID: <20220513174346.lnYvMQongt1Ib_ifxgytAwQdJwqgNUGwT177wbWLZgg@z> commit: 430a699ca9262b25fea2e8e2f0ce4eea56e6c898 Author: Daniel Cordero 0xdc io> AuthorDate: Thu Apr 21 07:08:25 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri May 13 17:42:41 2022 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=430a699c catalyst/stage4: don't split a single entry A single entry in users is one user who could have multiple groups. Fixes: 5be6069b ("catalyst: support 3 new options") Signed-off-by: Daniel Cordero 0xdc.io> Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 7e6b9e32..d4875491 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -602,7 +602,7 @@ class StageBase(TargetBase, ClearBase, GenBase): if users in self.settings: self.settings["users"] = self.settings[users] if isinstance(self.settings[users], str): - self.settings["users"] = self.settings[users].split(",") + self.settings["users"] = [self.settings[users]] del self.settings[users] else: self.settings["users"] = []