Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:stage4-user-groups-fixes commit in: catalyst/base/
Date: Fri, 13 May 2022 17:43:49
Message-Id: 1652463761.430a699ca9262b25fea2e8e2f0ce4eea56e6c898.mattst88@gentoo
1 commit: 430a699ca9262b25fea2e8e2f0ce4eea56e6c898
2 Author: Daniel Cordero <gentoo.catalyst <AT> 0xdc <DOT> io>
3 AuthorDate: Thu Apr 21 07:08:25 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Fri May 13 17:42:41 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=430a699c
7
8 catalyst/stage4: don't split a single entry
9
10 A single entry in users is one user who could have multiple groups.
11
12 Fixes: 5be6069b ("catalyst: support 3 new options")
13 Signed-off-by: Daniel Cordero <gentoo.catalyst <AT> 0xdc.io>
14 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
15
16 catalyst/base/stagebase.py | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
20 index 7e6b9e32..d4875491 100644
21 --- a/catalyst/base/stagebase.py
22 +++ b/catalyst/base/stagebase.py
23 @@ -602,7 +602,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
24 if users in self.settings:
25 self.settings["users"] = self.settings[users]
26 if isinstance(self.settings[users], str):
27 - self.settings["users"] = self.settings[users].split(",")
28 + self.settings["users"] = [self.settings[users]]
29 del self.settings[users]
30 else:
31 self.settings["users"] = []