| 1 |
commit: 5b08b471611670b4cc996e45c387ecd951fb2142 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 12 14:40:12 2013 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 26 19:58:28 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5b08b471 |
| 7 |
|
| 8 |
Fix livecd source and target paths not ending with a slash |
| 9 |
|
| 10 |
--- |
| 11 |
catalyst/base/stagebase.py | 2 +- |
| 12 |
catalyst/targets/livecd_stage1.py | 3 +-- |
| 13 |
catalyst/targets/livecd_stage2.py | 2 +- |
| 14 |
3 files changed, 3 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 17 |
index bdeaedd..eec74df 100644 |
| 18 |
--- a/catalyst/base/stagebase.py |
| 19 |
+++ b/catalyst/base/stagebase.py |
| 20 |
@@ -294,7 +294,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 21 |
def set_target_subpath(self): |
| 22 |
self.settings["target_subpath"]=self.settings["rel_type"]+"/"+\ |
| 23 |
self.settings["target"]+"-"+self.settings["subarch"]+"-"+\ |
| 24 |
- self.settings["version_stamp"] |
| 25 |
+ self.settings["version_stamp"] +'/' |
| 26 |
|
| 27 |
def set_source_subpath(self): |
| 28 |
if type(self.settings["source_subpath"])!=types.StringType: |
| 29 |
|
| 30 |
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py |
| 31 |
index 55859bc..8402e7a 100644 |
| 32 |
--- a/catalyst/targets/livecd_stage1.py |
| 33 |
+++ b/catalyst/targets/livecd_stage1.py |
| 34 |
@@ -33,7 +33,7 @@ class livecd_stage1(StageBase): |
| 35 |
"unbind", "clean","clear_autoresume"] |
| 36 |
|
| 37 |
def set_target_path(self): |
| 38 |
- self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]) |
| 39 |
+ self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+'/') |
| 40 |
if "autoresume" in self.settings["options"] \ |
| 41 |
and self.resume.is_enabled("setup_target_path"): |
| 42 |
print "Resume point detected, skipping target path setup operation..." |
| 43 |
@@ -43,7 +43,6 @@ class livecd_stage1(StageBase): |
| 44 |
cmd("rm -rf "+self.settings["target_path"],\ |
| 45 |
"Could not remove existing directory: "+self.settings["target_path"],env=self.env) |
| 46 |
self.resume.enable("setup_target_path") |
| 47 |
- |
| 48 |
ensure_dirs(self.settings["target_path"]) |
| 49 |
|
| 50 |
def set_spec_prefix(self): |
| 51 |
|
| 52 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 53 |
index 45a6767..55e6897 100644 |
| 54 |
--- a/catalyst/targets/livecd_stage2.py |
| 55 |
+++ b/catalyst/targets/livecd_stage2.py |
| 56 |
@@ -43,7 +43,7 @@ class livecd_stage2(StageBase): |
| 57 |
self.settings["hash_map"].generate_hash( |
| 58 |
self.settings["source_path"]) |
| 59 |
else: |
| 60 |
- self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]) |
| 61 |
+ self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+'/') |
| 62 |
if not os.path.exists(self.settings["source_path"]): |
| 63 |
raise CatalystError("Source Path: " + |
| 64 |
self.settings["source_path"] + " does not exist.", |
Archives