| 1 |
commit: 7895f714e63b060baef970424c2a843d17b841be |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 17 06:22:41 2013 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun Dec 29 18:54:06 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7895f714 |
| 7 |
|
| 8 |
Remove some troublesome trailing slashes from paths |
| 9 |
|
| 10 |
--- |
| 11 |
modules/generic_stage_target.py | 6 +++--- |
| 12 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
| 15 |
index bbea57a..f69f192 100644 |
| 16 |
--- a/modules/generic_stage_target.py |
| 17 |
+++ b/modules/generic_stage_target.py |
| 18 |
@@ -459,7 +459,7 @@ class generic_stage_target(generic_target): |
| 19 |
if "SNAPCACHE" in self.settings: |
| 20 |
self.settings["snapshot_cache_path"]=\ |
| 21 |
normpath(self.settings["snapshot_cache"]+"/"+\ |
| 22 |
- self.settings["snapshot"]+"/") |
| 23 |
+ self.settings["snapshot"]) |
| 24 |
self.snapcache_lock=\ |
| 25 |
catalyst_lock.LockDir(self.settings["snapshot_cache_path"]) |
| 26 |
print "Caching snapshot to "+self.settings["snapshot_cache_path"] |
| 27 |
@@ -470,14 +470,14 @@ class generic_stage_target(generic_target): |
| 28 |
Things *will* break without it! |
| 29 |
""" |
| 30 |
self.settings["chroot_path"]=normpath(self.settings["storedir"]+\ |
| 31 |
- "/tmp/"+self.settings["target_subpath"]+"/") |
| 32 |
+ "/tmp/"+self.settings["target_subpath"]) |
| 33 |
self.chroot_lock=catalyst_lock.LockDir(self.settings["chroot_path"]) |
| 34 |
|
| 35 |
def set_autoresume_path(self): |
| 36 |
self.settings["autoresume_path"]=normpath(self.settings["storedir"]+\ |
| 37 |
"/tmp/"+self.settings["rel_type"]+"/"+".autoresume-"+\ |
| 38 |
self.settings["target"]+"-"+self.settings["subarch"]+"-"+\ |
| 39 |
- self.settings["version_stamp"]+"/") |
| 40 |
+ self.settings["version_stamp"]) |
| 41 |
if "AUTORESUME" in self.settings: |
| 42 |
print "The autoresume path is " + self.settings["autoresume_path"] |
| 43 |
if not os.path.exists(self.settings["autoresume_path"]): |
Archives