1 |
commit: 4cac82c0678ae882fb2371b9499d15eff2ecf140 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 00:32:34 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 16:03:41 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4cac82c0 |
7 |
|
8 |
catalyst: Use .extend() and .append() for action_sequence |
9 |
|
10 |
Ensures that we don't overwrite and lose some settings. |
11 |
|
12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
13 |
|
14 |
catalyst/base/stagebase.py | 6 +++--- |
15 |
catalyst/targets/embedded.py | 4 ++-- |
16 |
catalyst/targets/livecd_stage1.py | 4 ++-- |
17 |
catalyst/targets/livecd_stage2.py | 8 ++++---- |
18 |
catalyst/targets/netboot.py | 4 ++-- |
19 |
catalyst/targets/stage4.py | 4 ++-- |
20 |
6 files changed, 15 insertions(+), 15 deletions(-) |
21 |
|
22 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
23 |
index bee8b57a..5f40d3e9 100644 |
24 |
--- a/catalyst/base/stagebase.py |
25 |
+++ b/catalyst/base/stagebase.py |
26 |
@@ -478,13 +478,13 @@ class StageBase(TargetBase, ClearBase, GenBase): |
27 |
Or it calls the normal set_action_sequence() for the target stage. |
28 |
""" |
29 |
if "purgeonly" in self.settings["options"]: |
30 |
- self.action_sequence = ["remove_chroot"] |
31 |
+ self.action_sequence.append("remove_chroot") |
32 |
return |
33 |
self.set_action_sequence() |
34 |
|
35 |
def set_action_sequence(self): |
36 |
"""Set basic stage1, 2, 3 action sequences""" |
37 |
- self.action_sequence = [ |
38 |
+ self.action_sequence.extend([ |
39 |
"unpack", |
40 |
"setup_confdir", |
41 |
"portage_overlay", |
42 |
@@ -495,7 +495,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
43 |
"preclean", |
44 |
"unbind", |
45 |
"clean", |
46 |
- ] |
47 |
+ ]) |
48 |
self.set_completion_action_sequences() |
49 |
|
50 |
def set_completion_action_sequences(self): |
51 |
|
52 |
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py |
53 |
index 3899cf1b..75eb68e4 100644 |
54 |
--- a/catalyst/targets/embedded.py |
55 |
+++ b/catalyst/targets/embedded.py |
56 |
@@ -41,7 +41,7 @@ class embedded(StageBase): |
57 |
StageBase.__init__(self, spec, addlargs) |
58 |
|
59 |
def set_action_sequence(self): |
60 |
- self.action_sequence = [ |
61 |
+ self.action_sequence.extend([ |
62 |
"unpack", |
63 |
"config_profile_link", |
64 |
"setup_confdir", |
65 |
@@ -60,7 +60,7 @@ class embedded(StageBase): |
66 |
"clean", |
67 |
"capture", |
68 |
"clear_autoresume", |
69 |
- ] |
70 |
+ ]) |
71 |
|
72 |
def set_stage_path(self): |
73 |
self.settings["stage_path"] = normpath( |
74 |
|
75 |
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py |
76 |
index b8c26cb1..9dbfa506 100644 |
77 |
--- a/catalyst/targets/livecd_stage1.py |
78 |
+++ b/catalyst/targets/livecd_stage1.py |
79 |
@@ -23,7 +23,7 @@ class livecd_stage1(StageBase): |
80 |
StageBase.__init__(self, spec, addlargs) |
81 |
|
82 |
def set_action_sequence(self): |
83 |
- self.action_sequence = [ |
84 |
+ self.action_sequence.extend([ |
85 |
"unpack", |
86 |
"config_profile_link", |
87 |
"setup_confdir", |
88 |
@@ -34,7 +34,7 @@ class livecd_stage1(StageBase): |
89 |
"build_packages", |
90 |
"unbind", |
91 |
"clean", |
92 |
- ] |
93 |
+ ]) |
94 |
self.set_completion_action_sequences() |
95 |
|
96 |
def set_spec_prefix(self): |
97 |
|
98 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
99 |
index cac16b6e..c9b5ce08 100644 |
100 |
--- a/catalyst/targets/livecd_stage2.py |
101 |
+++ b/catalyst/targets/livecd_stage2.py |
102 |
@@ -87,7 +87,7 @@ class livecd_stage2(StageBase): |
103 |
print_traceback=True) |
104 |
|
105 |
def set_action_sequence(self): |
106 |
- self.action_sequence = [ |
107 |
+ self.action_sequence.extend([ |
108 |
"unpack", |
109 |
"config_profile_link", |
110 |
"setup_confdir", |
111 |
@@ -97,9 +97,9 @@ class livecd_stage2(StageBase): |
112 |
"setup_environment", |
113 |
"run_local", |
114 |
"build_kernel" |
115 |
- ] |
116 |
+ ]) |
117 |
if "fetch" not in self.settings["options"]: |
118 |
- self.action_sequence += [ |
119 |
+ self.action_sequence.extend([ |
120 |
"bootloader", |
121 |
"preclean", |
122 |
"livecd_update", |
123 |
@@ -114,5 +114,5 @@ class livecd_stage2(StageBase): |
124 |
"target_setup", |
125 |
"setup_overlay", |
126 |
"create_iso", |
127 |
- ] |
128 |
+ ]) |
129 |
self.action_sequence.append("clear_autoresume") |
130 |
|
131 |
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py |
132 |
index 61583f0d..e5c6d43c 100644 |
133 |
--- a/catalyst/targets/netboot.py |
134 |
+++ b/catalyst/targets/netboot.py |
135 |
@@ -160,7 +160,7 @@ class netboot(StageBase): |
136 |
self.resume.enable("empty") |
137 |
|
138 |
def set_action_sequence(self): |
139 |
- self.action_sequence = [ |
140 |
+ self.action_sequence.extend([ |
141 |
"unpack", |
142 |
"config_profile_link", |
143 |
"setup_confdir", |
144 |
@@ -179,4 +179,4 @@ class netboot(StageBase): |
145 |
"unbind", |
146 |
"clean", |
147 |
"clear_autoresume", |
148 |
- ] |
149 |
+ ]) |
150 |
|
151 |
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py |
152 |
index eef24a73..bb20be79 100644 |
153 |
--- a/catalyst/targets/stage4.py |
154 |
+++ b/catalyst/targets/stage4.py |
155 |
@@ -39,7 +39,7 @@ class stage4(StageBase): |
156 |
self.settings["cleanables"].remove('/etc/resolv.conf') |
157 |
|
158 |
def set_action_sequence(self): |
159 |
- self.action_sequence = [ |
160 |
+ self.action_sequence.extend([ |
161 |
"unpack", |
162 |
"config_profile_link", |
163 |
"setup_confdir", |
164 |
@@ -59,5 +59,5 @@ class stage4(StageBase): |
165 |
"remove", |
166 |
"empty", |
167 |
"clean", |
168 |
- ] |
169 |
+ ]) |
170 |
self.set_completion_action_sequences() |