commit: 9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 00:29:52 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Jan 1 05:58:06 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9ce3a913
Mixed spaces/tabs and indent cleanup.
---
catalyst/targets/livecd_stage2.py | 2 +-
catalyst/targets/netboot.py | 11 +++++------
catalyst/targets/netboot2.py | 10 +++++-----
catalyst/targets/stage4.py | 18 +++++++++---------
catalyst/targets/tinderbox.py | 8 ++++----
5 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/catalyst/targets/livecd_stage2.py
b/catalyst/targets/livecd_stage2.py
index 949ee98..b1cf6b2 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -49,7 +49,7 @@ class livecd_stage2(StageBase):
print_traceback=True)
def set_spec_prefix(self):
- self.settings["spec_prefix"]="livecd"
+ self.settings["spec_prefix"]="livecd"
def set_target_path(self):
self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/")
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index 7ae1d75..de8dc85 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -122,13 +122,12 @@ class netboot(StageBase):
self.unbind()
raise CatalystError("netboot build aborting due to
error.",
print_traceback=True)
-
# end
print "netboot: build finished !"
def set_action_sequence(self):
- self.settings["action_sequence"]=["unpack","unpack_snapshot",
-
"config_profile_link","setup_confdir","bind","chroot_setup",\
-
"setup_environment","build_packages","build_busybox",\
-
"build_kernel","copy_files_to_image",\
-
"clean","create_netboot_files","unbind","clear_autoresume"]
+ self.settings["action_sequence"]=["unpack","unpack_snapshot",
+
"config_profile_link","setup_confdir","bind","chroot_setup",\
+ "setup_environment","build_packages","build_busybox",\
+ "build_kernel","copy_files_to_image",\
+
"clean","create_netboot_files","unbind","clear_autoresume"]
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py
index dbbb6a9..e9e2625 100644
--- a/catalyst/targets/netboot2.py
+++ b/catalyst/targets/netboot2.py
@@ -164,8 +164,8 @@ class netboot2(StageBase):
touch(self.settings["autoresume_path"]+"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 4aef33f..857976b 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -14,10 +14,10 @@ class stage4(StageBase):
self.required_values=["stage4/packages"]
self.valid_values=self.required_values[:]
self.valid_values.extend(["stage4/use","boot/kernel",\
- "stage4/root_overlay","stage4/fsscript",\
- "stage4/gk_mainargs","splash_theme",\
-
"portage_overlay","stage4/rcadd","stage4/rcdel",\
-
"stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"])
+ "stage4/root_overlay","stage4/fsscript",\
+ "stage4/gk_mainargs","splash_theme",\
+ "portage_overlay","stage4/rcadd","stage4/rcdel",\
+
"stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"])
StageBase.__init__(self,spec,addlargs)
def set_cleanables(self):
@@ -25,11 +25,11 @@ class stage4(StageBase):
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"]
+
"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"]
# if "TARBALL" in self.settings or \
# "fetch" not in self.settings['options']:
diff --git a/catalyst/targets/tinderbox.py b/catalyst/targets/tinderbox.py
index 59e85d0..c9ed9b8 100644
--- a/catalyst/targets/tinderbox.py
+++ b/catalyst/targets/tinderbox.py
@@ -24,7 +24,7 @@ class tinderbox(StageBase):
# example call: "grp.sh run xmms vim sys-apps/gleep"
try:
if os.path.exists(self.settings["controller_file"]):
- cmd(self.settings["controller_file"]+" run "+\
+ cmd(self.settings["controller_file"]+" run "+\
list_bashify(self.settings["tinderbox/packages"]),"run script
failed.",env=self.env)
except CatalystError:
@@ -43,6 +43,6 @@ class tinderbox(StageBase):
def set_action_sequence(self):
#Default action sequence for run method
self.settings["action_sequence"]=["unpack","unpack_snapshot",\
-
"config_profile_link","setup_confdir","bind","chroot_setup",\
-
"setup_environment","run_local","preclean","unbind","clean",\
- "clear_autoresume"]
+
"config_profile_link","setup_confdir","bind","chroot_setup",\
+
"setup_environment","run_local","preclean","unbind","clean",\
+ "clear_autoresume"]
