aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-10-28 20:32:34 -0400
committerMatt Turner <mattst88@gentoo.org>2020-10-30 18:40:52 -0400
commit2c28062446246e246c992ea7084a3950b1337827 (patch)
treed38ba8fc1c056db88f8dc4d4df23e9bc9585d51c /catalyst/base
parentcatalyst: Move action_sequence out of self.settings[] (diff)
downloadcatalyst-2c28062446246e246c992ea7084a3950b1337827.tar.gz
catalyst-2c28062446246e246c992ea7084a3950b1337827.tar.bz2
catalyst-2c28062446246e246c992ea7084a3950b1337827.zip
catalyst: Use .extend() and .append() for action_sequence
Ensures that we don't overwrite and lose some settings. Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'catalyst/base')
-rw-r--r--catalyst/base/stagebase.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 801df2fb..46b7c59c 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -478,13 +478,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
Or it calls the normal set_action_sequence() for the target stage.
"""
if "purgeonly" in self.settings["options"]:
- self.action_sequence = ["remove_chroot"]
+ self.action_sequence.append("remove_chroot")
return
self.set_action_sequence()
def set_action_sequence(self):
"""Set basic stage1, 2, 3 action sequences"""
- self.action_sequence = [
+ self.action_sequence.extend([
"unpack",
"setup_confdir",
"portage_overlay",
@@ -495,7 +495,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
"preclean",
"unbind",
"clean",
- ]
+ ])
self.set_completion_action_sequences()
def set_completion_action_sequences(self):