mixed spaces/tabs and indent cleanup.

diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index a5830281b1f19a4649b2ca020c4e160c07229f63..37cdd40aa0e7aac79dddaae3a67fbc14bce71e5b 100644 (file)
--- 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 7ae1d7582f92f82e812b3158c4e7d5c5ebb573e6..de8dc858ae2c9e93f664d7a8c0eada12cbff9fdd 100644 (file)
--- 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 e8e7d22d2ced94d454679983e0afea7764ec62fc..f9b2a7b38b09882abf62e0d143c033fe13b629d0 100644 (file)
--- 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 f959c4a5b7789f910cbc17e9cd1c6686070156dc..310344ca0d2b105696d0686692690ba2668c1ceb 100644 (file)
--- 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 1c91aac1efa4eb64a8cb99ebca2c04f1a0cdd03d..2cebaa89080e861c0ccb5a63bc655c85a5df5f85 100644 (file)
--- 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:
@@ -35,12 +35,12 @@ class tinderbox(StageBase):
                                print_traceback=True)
 
        def set_cleanables(self):
-           self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/root/*",
+               self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/root/*",
                                        self.settings['portdir']]
 
        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"]