Fix livecd source and target paths not ending with a slash

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 160c3a1bf552c263c018e352cc7d925975be9648..09ebdb026ea1e936d6d75f3d2130095cd0354d37 100644 (file)
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -285,7 +285,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
        def set_target_subpath(self):
                self.settings["target_subpath"]=self.settings["rel_type"]+"/"+\
                                self.settings["target"]+"-"+self.settings["subarch"]+"-"+\
-                               self.settings["version_stamp"]
+                               self.settings["version_stamp"] +'/'
 
        def set_source_subpath(self):
                if type(self.settings["source_subpath"])!=types.StringType:

diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
index 55859bc8b8d043ba0723bb646ac15681c2a2b586..8402e7aaae1fab57b0fc6c35492b4f83c113d16c 100644 (file)
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -33,7 +33,7 @@ class livecd_stage1(StageBase):
                                        "unbind", "clean","clear_autoresume"]
 
        def set_target_path(self):
-               self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
+               self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+'/')
                if "autoresume" in self.settings["options"] \
                        and self.resume.is_enabled("setup_target_path"):
                                print "Resume point detected, skipping target path setup operation..."
@@ -43,7 +43,6 @@ class livecd_stage1(StageBase):
                                cmd("rm -rf "+self.settings["target_path"],\
                                        "Could not remove existing directory: "+self.settings["target_path"],env=self.env)
                                self.resume.enable("setup_target_path")
-
                        ensure_dirs(self.settings["target_path"])
 
        def set_spec_prefix(self):

diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 82c69b03603501e987c85f89aec1ac5f361f1e0c..e8bee7d42c2b87d712ba3a45cc417221820f9e9e 100644 (file)
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -44,7 +44,7 @@ class livecd_stage2(StageBase):
                                self.settings["hash_map"].generate_hash(
                                        self.settings["source_path"])
                else:
-                       self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"])
+                       self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+'/')
                if not os.path.exists(self.settings["source_path"]):
                        raise CatalystError("Source Path: " +
                                self.settings["source_path"] + " does not exist.",