Will need to be applied manually to master, but should be done if you
intend to release another bugfix release in the 2.x series. At least use
the files changed to fix the files in current master. I'm not sure if
this one would easily apply to master.
==============================================================
diff --git a/catalyst/targets/livecd_stage2.py
b/catalyst/targets/livecd_stage2.py
index a583028..37cdd40 100644
@@ -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 7ae1d75..de8dc85 100644
@@ -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 e8e7d22..f9b2a7b 100644
@@ -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 f959c4a..310344c 100644
@@ -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 1c91aac..2cebaa8 100644
@@ -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"]
--
Brian Dolbec <[email protected]>
