1 |
commit: ac21cae9dfa75a8e79c6d67ce61d7aadd5111bb2 |
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: Wed Jan 1 23:55:32 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ac21cae9 |
7 |
|
8 |
Remove some troublesome trailing slashes from paths |
9 |
|
10 |
Change the docstring to warn to use a proper path join function. |
11 |
|
12 |
--- |
13 |
modules/generic_stage_target.py | 8 ++++---- |
14 |
1 file changed, 4 insertions(+), 4 deletions(-) |
15 |
|
16 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
17 |
index c6a06b6..aafcc32 100644 |
18 |
--- a/modules/generic_stage_target.py |
19 |
+++ b/modules/generic_stage_target.py |
20 |
@@ -459,18 +459,18 @@ class generic_stage_target(generic_target): |
21 |
if "SNAPCACHE" in self.settings: |
22 |
self.settings["snapshot_cache_path"]=\ |
23 |
normpath(self.settings["snapshot_cache"]+"/"+\ |
24 |
- self.settings["snapshot"]+"/") |
25 |
+ self.settings["snapshot"]) |
26 |
self.snapcache_lock=\ |
27 |
catalyst_lock.LockDir(self.settings["snapshot_cache_path"]) |
28 |
print "Caching snapshot to "+self.settings["snapshot_cache_path"] |
29 |
|
30 |
def set_chroot_path(self): |
31 |
""" |
32 |
- NOTE: the trailing slash is very important! |
33 |
- Things *will* break without it! |
34 |
+ NOTE: the trailing slash has been removed |
35 |
+ Things *could* break if you don't use a proper join() |
36 |
""" |
37 |
self.settings["chroot_path"]=normpath(self.settings["storedir"]+\ |
38 |
- "/tmp/"+self.settings["target_subpath"]+"/") |
39 |
+ "/tmp/"+self.settings["target_subpath"]) |
40 |
self.chroot_lock=catalyst_lock.LockDir(self.settings["chroot_path"]) |
41 |
|
42 |
def set_autoresume_path(self): |