| 1 |
commit: 9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 25 00:29:52 2013 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 1 05:58:06 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9ce3a913 |
| 7 |
|
| 8 |
Mixed spaces/tabs and indent cleanup. |
| 9 |
|
| 10 |
--- |
| 11 |
catalyst/targets/livecd_stage2.py | 2 +- |
| 12 |
catalyst/targets/netboot.py | 11 +++++------ |
| 13 |
catalyst/targets/netboot2.py | 10 +++++----- |
| 14 |
catalyst/targets/stage4.py | 18 +++++++++--------- |
| 15 |
catalyst/targets/tinderbox.py | 8 ++++---- |
| 16 |
5 files changed, 24 insertions(+), 25 deletions(-) |
| 17 |
|
| 18 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 19 |
index 949ee98..b1cf6b2 100644 |
| 20 |
--- a/catalyst/targets/livecd_stage2.py |
| 21 |
+++ b/catalyst/targets/livecd_stage2.py |
| 22 |
@@ -49,7 +49,7 @@ class livecd_stage2(StageBase): |
| 23 |
print_traceback=True) |
| 24 |
|
| 25 |
def set_spec_prefix(self): |
| 26 |
- self.settings["spec_prefix"]="livecd" |
| 27 |
+ self.settings["spec_prefix"]="livecd" |
| 28 |
|
| 29 |
def set_target_path(self): |
| 30 |
self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/") |
| 31 |
|
| 32 |
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py |
| 33 |
index 7ae1d75..de8dc85 100644 |
| 34 |
--- a/catalyst/targets/netboot.py |
| 35 |
+++ b/catalyst/targets/netboot.py |
| 36 |
@@ -122,13 +122,12 @@ class netboot(StageBase): |
| 37 |
self.unbind() |
| 38 |
raise CatalystError("netboot build aborting due to error.", |
| 39 |
print_traceback=True) |
| 40 |
- |
| 41 |
# end |
| 42 |
print "netboot: build finished !" |
| 43 |
|
| 44 |
def set_action_sequence(self): |
| 45 |
- self.settings["action_sequence"]=["unpack","unpack_snapshot", |
| 46 |
- "config_profile_link","setup_confdir","bind","chroot_setup",\ |
| 47 |
- "setup_environment","build_packages","build_busybox",\ |
| 48 |
- "build_kernel","copy_files_to_image",\ |
| 49 |
- "clean","create_netboot_files","unbind","clear_autoresume"] |
| 50 |
+ self.settings["action_sequence"]=["unpack","unpack_snapshot", |
| 51 |
+ "config_profile_link","setup_confdir","bind","chroot_setup",\ |
| 52 |
+ "setup_environment","build_packages","build_busybox",\ |
| 53 |
+ "build_kernel","copy_files_to_image",\ |
| 54 |
+ "clean","create_netboot_files","unbind","clear_autoresume"] |
| 55 |
|
| 56 |
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py |
| 57 |
index dbbb6a9..e9e2625 100644 |
| 58 |
--- a/catalyst/targets/netboot2.py |
| 59 |
+++ b/catalyst/targets/netboot2.py |
| 60 |
@@ -164,8 +164,8 @@ class netboot2(StageBase): |
| 61 |
touch(self.settings["autoresume_path"]+"empty") |
| 62 |
|
| 63 |
def set_action_sequence(self): |
| 64 |
- self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link", |
| 65 |
- "setup_confdir","portage_overlay","bind","chroot_setup",\ |
| 66 |
- "setup_environment","build_packages","root_overlay",\ |
| 67 |
- "copy_files_to_image","setup_overlay","build_kernel","move_kernels",\ |
| 68 |
- "remove","empty","unbind","clean","clear_autoresume"] |
| 69 |
+ self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link", |
| 70 |
+ "setup_confdir","portage_overlay","bind","chroot_setup",\ |
| 71 |
+ "setup_environment","build_packages","root_overlay",\ |
| 72 |
+ "copy_files_to_image","setup_overlay","build_kernel","move_kernels",\ |
| 73 |
+ "remove","empty","unbind","clean","clear_autoresume"] |
| 74 |
|
| 75 |
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py |
| 76 |
index 4aef33f..857976b 100644 |
| 77 |
--- a/catalyst/targets/stage4.py |
| 78 |
+++ b/catalyst/targets/stage4.py |
| 79 |
@@ -14,10 +14,10 @@ class stage4(StageBase): |
| 80 |
self.required_values=["stage4/packages"] |
| 81 |
self.valid_values=self.required_values[:] |
| 82 |
self.valid_values.extend(["stage4/use","boot/kernel",\ |
| 83 |
- "stage4/root_overlay","stage4/fsscript",\ |
| 84 |
- "stage4/gk_mainargs","splash_theme",\ |
| 85 |
- "portage_overlay","stage4/rcadd","stage4/rcdel",\ |
| 86 |
- "stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"]) |
| 87 |
+ "stage4/root_overlay","stage4/fsscript",\ |
| 88 |
+ "stage4/gk_mainargs","splash_theme",\ |
| 89 |
+ "portage_overlay","stage4/rcadd","stage4/rcdel",\ |
| 90 |
+ "stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"]) |
| 91 |
StageBase.__init__(self,spec,addlargs) |
| 92 |
|
| 93 |
def set_cleanables(self): |
| 94 |
@@ -25,11 +25,11 @@ class stage4(StageBase): |
| 95 |
|
| 96 |
def set_action_sequence(self): |
| 97 |
self.settings["action_sequence"]=["unpack","unpack_snapshot",\ |
| 98 |
- "config_profile_link","setup_confdir","portage_overlay",\ |
| 99 |
- "bind","chroot_setup","setup_environment","build_packages",\ |
| 100 |
- "build_kernel","bootloader","root_overlay","fsscript",\ |
| 101 |
- "preclean","rcupdate","unmerge","unbind","remove","empty",\ |
| 102 |
- "clean"] |
| 103 |
+ "config_profile_link","setup_confdir","portage_overlay",\ |
| 104 |
+ "bind","chroot_setup","setup_environment","build_packages",\ |
| 105 |
+ "build_kernel","bootloader","root_overlay","fsscript",\ |
| 106 |
+ "preclean","rcupdate","unmerge","unbind","remove","empty",\ |
| 107 |
+ "clean"] |
| 108 |
|
| 109 |
# if "TARBALL" in self.settings or \ |
| 110 |
# "fetch" not in self.settings['options']: |
| 111 |
|
| 112 |
diff --git a/catalyst/targets/tinderbox.py b/catalyst/targets/tinderbox.py |
| 113 |
index 59e85d0..c9ed9b8 100644 |
| 114 |
--- a/catalyst/targets/tinderbox.py |
| 115 |
+++ b/catalyst/targets/tinderbox.py |
| 116 |
@@ -24,7 +24,7 @@ class tinderbox(StageBase): |
| 117 |
# example call: "grp.sh run xmms vim sys-apps/gleep" |
| 118 |
try: |
| 119 |
if os.path.exists(self.settings["controller_file"]): |
| 120 |
- cmd(self.settings["controller_file"]+" run "+\ |
| 121 |
+ cmd(self.settings["controller_file"]+" run "+\ |
| 122 |
list_bashify(self.settings["tinderbox/packages"]),"run script failed.",env=self.env) |
| 123 |
|
| 124 |
except CatalystError: |
| 125 |
@@ -43,6 +43,6 @@ class tinderbox(StageBase): |
| 126 |
def set_action_sequence(self): |
| 127 |
#Default action sequence for run method |
| 128 |
self.settings["action_sequence"]=["unpack","unpack_snapshot",\ |
| 129 |
- "config_profile_link","setup_confdir","bind","chroot_setup",\ |
| 130 |
- "setup_environment","run_local","preclean","unbind","clean",\ |
| 131 |
- "clear_autoresume"] |
| 132 |
+ "config_profile_link","setup_confdir","bind","chroot_setup",\ |
| 133 |
+ "setup_environment","run_local","preclean","unbind","clean",\ |
| 134 |
+ "clear_autoresume"] |
Archives