commit: 208ad850b52416b80844a553836bdd76f092692c
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 01:08:29 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 01:11:45 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=208ad850
stagebase.py: Fix -P action for stages beyond stage3
Since commit f2afd7ff03e6e8453e86be938bd21c2cd33d3996 it removed the return
after calling purge(). Since the remove_chroot operation was separated and
that return removed, any target stage that overrode the set_action_sequence no
longer did the ful purgeonly step, but continued to add the normal
action_sequences for that stage.
catalyst/base/stagebase.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index a880249..c2902ed 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -160,7 +160,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.set_target_path()
self.set_controller_file()
- self.set_action_sequence()
+ self.set_default_action_sequence()
self.set_use()
self.set_cleanables()
self.set_iso_volume_id()
@@ -497,11 +497,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
self.settings["iso_volume_id"]="catalyst
"+self.settings["snapshot"]
- def set_action_sequence(self):
+ def set_default_action_sequence(self):
""" Default action sequence for run method """
if "purgeonly" in self.settings["options"]:
self.settings["action_sequence"] = ["remove_chroot"]
return
+ self.set_action_sequence()
+
+ def set_action_sequence(self):
self.settings["action_sequence"]=["unpack","unpack_snapshot",\
"setup_confdir","portage_overlay",\
"base_dirs","bind","chroot_setup","setup_environment",\
