Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 03/37] catalyst: Fix obvious logic error
Date: Wed, 21 Oct 2020 00:24:05
Message-Id: 20201021002344.378131-3-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/37] catalyst: Use early return to unindent code by Matt Turner
1 Broken since 2005. I don't even know what the author could have been
2 thinking when they changed this.
3
4 Fixes: c06264e3 ("Initial import of Catalyst 2.0.0")
5 Signed-off-by: Matt Turner <mattst88@g.o>
6 ---
7 catalyst/base/stagebase.py | 4 +---
8 1 file changed, 1 insertion(+), 3 deletions(-)
9
10 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
11 index 532f7133..6f5aa23a 100644
12 --- a/catalyst/base/stagebase.py
13 +++ b/catalyst/base/stagebase.py
14 @@ -1530,9 +1530,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
15
16 if not isinstance(myopts, str):
17 myopts = ' '.join(myopts)
18 - self.env[kname + "_kernelopts"] = myopts
19 - else:
20 - self.env[kname + "_kernelopts"] = ""
21 + self.env[kname + "_kernelopts"] = myopts
22
23 key = 'boot/kernel/' + kname + '/extraversion'
24 self.settings.setdefault(key, '')
25 --
26 2.26.2