From 29147b007242db32bdea743ca3dcf5ee212a9f0b Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Sun, 24 Feb 2013 16:29:52 -0800 Subject: [PATCH] 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 b1db5586..8aa6d778 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -50,7 +50,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 7ae1d758..de8dc858 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 e8e7d22d..f9b2a7b3 100644 --- a/catalyst/targets/netboot2.py +++ b/catalyst/targets/netboot2.py @@ -165,8 +165,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 f959c4a5..310344ca 100644 --- a/catalyst/targets/stage4.py +++ b/catalyst/targets/stage4.py @@ -15,10 +15,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): @@ -26,11 +26,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 f79a13ed..ed1bc951 100644 --- a/catalyst/targets/tinderbox.py +++ b/catalyst/targets/tinderbox.py @@ -26,7 +26,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: @@ -45,6 +45,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"] -- 2.26.2