commit:     b55d6967fcbf9b2d10c324d4eb523f28f0829909
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  4 15:14:11 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Jan  4 19:08:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b55d6967

targets/livecd_stage2.py: Add "clean" action

Add clean to clear out the tree used to build with.
Seems "empty" used to be hard coded to clean it out.

 catalyst/targets/livecd_stage2.py | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/catalyst/targets/livecd_stage2.py 
b/catalyst/targets/livecd_stage2.py
index a3b5e5e6..63f77ac3 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -68,13 +68,33 @@ class livecd_stage2(StageBase):
                                        print_traceback=True)
 
        def set_action_sequence(self):
-               self.settings["action_sequence"]=["unpack","unpack_snapshot",\
-                               
"config_profile_link","setup_confdir","portage_overlay",\
-                               
"bind","chroot_setup","setup_environment","run_local",\
-                               "build_kernel"]
+               self.settings["action_sequence"]=[
+                       "unpack",
+                       "unpack_snapshot",
+                       "config_profile_link",
+                       "setup_confdir",
+                       "portage_overlay",
+                       "bind",
+                       "chroot_setup",
+                       "setup_environment",
+                       "run_local",
+                       "build_kernel"
+               ]
                if "fetch" not in self.settings["options"]:
-                       self.settings["action_sequence"] += 
["bootloader","preclean",\
-                               
"livecd_update","root_overlay","fsscript","rcupdate","unmerge",\
-                               "unbind","remove","empty","target_setup",\
-                               "setup_overlay","create_iso"]
+                       self.settings["action_sequence"] += [
+                               "bootloader",
+                               "preclean",
+                               "livecd_update",
+                               "root_overlay",
+                               "fsscript",
+                               "rcupdate",
+                               "unmerge",
+                               "unbind",
+                               "remove",
+                               "empty",
+                               "clean",
+                               "target_setup",
+                               "setup_overlay",
+                               "create_iso"
+                       ]
                self.settings["action_sequence"].append("clear_autoresume")

Reply via email to