Gentoo Archives: gentoo-catalyst

From: Brian Dolbec <dolsen@g.o>
To: gentoo-catalyst@l.g.o
Cc: Brian Dolbec <dolsen@g.o>
Subject: [gentoo-catalyst] [PATCH 1/3] Remove some troublesome trailing slashes from paths
Date: Wed, 18 Dec 2013 01:12:32
Message-Id: 1387329131-25890-2-git-send-email-dolsen@gentoo.org
In Reply to: [gentoo-catalyst] Path addition fixes to prevent multiple slashes in paths. by Brian Dolbec
1 ---
2 modules/generic_stage_target.py | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-)
4
5 diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
6 index d9cc499..fea2f64 100644
7 --- a/modules/generic_stage_target.py
8 +++ b/modules/generic_stage_target.py
9 @@ -446,7 +446,7 @@ class generic_stage_target(generic_target):
10 if "SNAPCACHE" in self.settings:
11 self.settings["snapshot_cache_path"]=\
12 normpath(self.settings["snapshot_cache"]+"/"+\
13 - self.settings["snapshot"]+"/")
14 + self.settings["snapshot"])
15 self.snapcache_lock=\
16 catalyst_lock.LockDir(self.settings["snapshot_cache_path"])
17 print "Caching snapshot to "+self.settings["snapshot_cache_path"]
18 @@ -457,14 +457,14 @@ class generic_stage_target(generic_target):
19 Things *will* break without it!
20 """
21 self.settings["chroot_path"]=normpath(self.settings["storedir"]+\
22 - "/tmp/"+self.settings["target_subpath"]+"/")
23 + "/tmp/"+self.settings["target_subpath"])
24 self.chroot_lock=catalyst_lock.LockDir(self.settings["chroot_path"])
25
26 def set_autoresume_path(self):
27 self.settings["autoresume_path"]=normpath(self.settings["storedir"]+\
28 "/tmp/"+self.settings["rel_type"]+"/"+".autoresume-"+\
29 self.settings["target"]+"-"+self.settings["subarch"]+"-"+\
30 - self.settings["version_stamp"]+"/")
31 + self.settings["version_stamp"])
32 if "AUTORESUME" in self.settings:
33 print "The autoresume path is " + self.settings["autoresume_path"]
34 if not os.path.exists(self.settings["autoresume_path"]):
35 --
36 1.8.3.2

Replies

Subject Author
Re: [gentoo-catalyst] [PATCH 1/3] Remove some troublesome trailing slashes from paths "W. Trevor King" <wking@×××××××.us>