diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2013-06-12 07:40:12 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2015-02-26 11:58:28 -0800 |
| commit | 5b08b471611670b4cc996e45c387ecd951fb2142 (patch) | |
| tree | dbbaf2e3b01c86b763a3b00d0f7c1def40ff7b38 | |
| parent | main.py, lock.py, fileops.py remove shebangs (diff) | |
| download | catalyst-5b08b471611670b4cc996e45c387ecd951fb2142.tar.gz catalyst-5b08b471611670b4cc996e45c387ecd951fb2142.tar.bz2 catalyst-5b08b471611670b4cc996e45c387ecd951fb2142.zip | |
Fix livecd source and target paths not ending with a slash
| -rw-r--r-- | catalyst/base/stagebase.py | 2 | ||||
| -rw-r--r-- | catalyst/targets/livecd_stage1.py | 3 | ||||
| -rw-r--r-- | catalyst/targets/livecd_stage2.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index bdeaeddb..eec74dfd 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -294,7 +294,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 55859bc8..8402e7aa 100644 --- 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 45a6767b..55e68970 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -43,7 +43,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.", |