commit: d3a8f202bf8eb82cc1d61e2b2b9da4eadc550c90
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 00:36:46 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 20:29:57 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d3a8f202
catalyst: Reformat some array definitions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 17 +++++++++++++----
catalyst/targets/embedded.py | 29 +++++++++++++++++++++++------
catalyst/targets/livecd_stage1.py | 17 +++++++++++++----
catalyst/targets/livecd_stage2.py | 6 +++---
catalyst/targets/netboot.py | 26 +++++++++++++++++++++-----
catalyst/targets/stage4.py | 28 ++++++++++++++++++++++------
6 files changed, 95 insertions(+), 28 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 71bf1ef9..60cb891a 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -531,10 +531,19 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_action_sequence(self):
"""Set basic stage1, 2, 3 action sequences"""
- self.settings["action_sequence"] = ["unpack", "unpack_snapshot",
- "setup_confdir", "portage_overlay",
- "bind", "chroot_setup",
"setup_environment",
- "run_local", "preclean", "unbind",
"clean"]
+ self.settings['action_sequence'] = [
+ "unpack",
+ "unpack_snapshot",
+ "setup_confdir",
+ "portage_overlay",
+ "bind",
+ "chroot_setup",
+ "setup_environment",
+ "run_local",
+ "preclean",
+ "unbind",
+ "clean",
+ ]
self.set_completion_action_sequences()
def set_completion_action_sequences(self):
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index e288228e..189eb722 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -40,12 +40,29 @@ class embedded(StageBase):
StageBase.__init__(self, spec, addlargs)
def set_action_sequence(self):
- self.settings["action_sequence"] = ["dir_setup", "unpack",
"unpack_snapshot",
- "config_profile_link",
"setup_confdir",
- "portage_overlay", "bind",
"chroot_setup",
- "setup_environment",
"build_kernel", "build_packages",
- "bootloader", "root_overlay",
"fsscript", "unmerge",
- "unbind", "remove", "empty",
"clean", "capture", "clear_autoresume"]
+ self.settings['action_sequence'] = [
+ "dir_setup",
+ "unpack",
+ "unpack_snapshot",
+ "config_profile_link",
+ "setup_confdir",
+ "portage_overlay",
+ "bind",
+ "chroot_setup",
+ "setup_environment",
+ "build_kernel",
+ "build_packages",
+ "bootloader",
+ "root_overlay",
+ "fsscript",
+ "unmerge",
+ "unbind",
+ "remove",
+ "empty",
+ "clean",
+ "capture",
+ "clear_autoresume",
+ ]
def set_stage_path(self):
self.settings["stage_path"] = normpath(
diff --git a/catalyst/targets/livecd_stage1.py
b/catalyst/targets/livecd_stage1.py
index f4f6b512..727d95f2 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -23,10 +23,19 @@ class livecd_stage1(StageBase):
StageBase.__init__(self, spec, addlargs)
def set_action_sequence(self):
- self.settings["action_sequence"] = ["unpack", "unpack_snapshot",
- "config_profile_link",
"setup_confdir", "portage_overlay",
- "bind", "chroot_setup",
"setup_environment", "build_packages",
- "unbind", "clean"]
+ self.settings['action_sequence'] = [
+ "unpack",
+ "unpack_snapshot",
+ "config_profile_link",
+ "setup_confdir",
+ "portage_overlay",
+ "bind",
+ "chroot_setup",
+ "setup_environment",
+ "build_packages",
+ "unbind",
+ "clean",
+ ]
self.set_completion_action_sequences()
def set_spec_prefix(self):
diff --git a/catalyst/targets/livecd_stage2.py
b/catalyst/targets/livecd_stage2.py
index d41321e6..09de22fb 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -88,7 +88,7 @@ class livecd_stage2(StageBase):
print_traceback=True)
def set_action_sequence(self):
- self.settings["action_sequence"] = [
+ self.settings['action_sequence'] = [
"unpack",
"unpack_snapshot",
"config_profile_link",
@@ -101,7 +101,7 @@ class livecd_stage2(StageBase):
"build_kernel"
]
if "fetch" not in self.settings["options"]:
- self.settings["action_sequence"] += [
+ self.settings['action_sequence'] += [
"bootloader",
"preclean",
"livecd_update",
@@ -115,6 +115,6 @@ class livecd_stage2(StageBase):
"clean",
"target_setup",
"setup_overlay",
- "create_iso"
+ "create_iso",
]
self.settings["action_sequence"].append("clear_autoresume")
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index 12dcf989..7c37bad5 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -160,8 +160,24 @@ class netboot(StageBase):
self.resume.enable("empty")
def set_action_sequence(self):
- self.settings["action_sequence"] = ["unpack", "unpack_snapshot",
"config_profile_link",
- "setup_confdir",
"portage_overlay", "bind", "chroot_setup",
- "setup_environment",
"build_packages", "root_overlay",
- "copy_files_to_image",
"setup_overlay", "build_kernel", "move_kernels",
- "remove", "empty", "unbind",
"clean", "clear_autoresume"]
+ self.settings['action_sequence'] = [
+ "unpack",
+ "unpack_snapshot",
+ "config_profile_link",
+ "setup_confdir",
+ "portage_overlay",
+ "bind",
+ "chroot_setup",
+ "setup_environment",
+ "build_packages",
+ "root_overlay",
+ "copy_files_to_image",
+ "setup_overlay",
+ "build_kernel",
+ "move_kernels",
+ "remove",
+ "empty",
+ "unbind",
+ "clean",
+ "clear_autoresume",
+ ]
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 99b67934..a3de2cae 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -36,10 +36,26 @@ class stage4(StageBase):
self.settings["cleanables"] = ["/var/tmp/*", "/tmp/*"]
def set_action_sequence(self):
- self.settings["action_sequence"] = ["unpack", "unpack_snapshot",
- "config_profile_link",
"setup_confdir", "portage_overlay",
- "bind", "chroot_setup",
"setup_environment", "build_packages",
- "build_kernel", "bootloader",
"root_overlay", "fsscript",
- "preclean", "rcupdate", "unmerge",
"unbind", "remove", "empty",
- "clean"]
+ self.settings['action_sequence'] = [
+ "unpack",
+ "unpack_snapshot",
+ "config_profile_link",
+ "setup_confdir",
+ "portage_overlay",
+ "bind",
+ "chroot_setup",
+ "setup_environment",
+ "build_packages",
+ "build_kernel",
+ "bootloader",
+ "root_overlay",
+ "fsscript",
+ "preclean",
+ "rcupdate",
+ "unmerge",
+ "unbind",
+ "remove",
+ "empty",
+ "clean",
+ ]
self.set_completion_action_sequences()
