Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/
Date: Sat, 24 Oct 2020 22:07:53
Message-Id: 1603427602.3c50f0f689d5970a4803f3e4b745993c4de180f0.mattst88@gentoo
1 commit: 3c50f0f689d5970a4803f3e4b745993c4de180f0
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 23 04:33:22 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 23 04:33:22 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3c50f0f6
7
8 catalyst: Don't delete /usr/share/zoneinfo from stage1
9
10 I have no clue why we would want to (or even bother) delete the
11 timezone data out of stage1. It's been this way since the initial
12 catalyst 2.0 import.
13
14 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
15
16 catalyst/targets/stage1.py | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19 diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
20 index 93c62877..2c09a41f 100644
21 --- a/catalyst/targets/stage1.py
22 +++ b/catalyst/targets/stage1.py
23 @@ -36,7 +36,8 @@ class stage1(StageBase):
24 def set_cleanables(self):
25 StageBase.set_cleanables(self)
26 self.settings["cleanables"].extend([
27 - "/usr/share/zoneinfo", self.settings["port_conf"] + "/package*"])
28 + self.settings["port_conf"] + "/package*",
29 + ])
30
31 # XXX: How do these override_foo() functions differ from the ones in StageBase and why aren't they in stage3_target?
32 # XXY: It appears the difference is that these functions are actually doing something and the ones in stagebase don't :-(