Gentoo Archives: gentoo-commits

From: Brian Dolbec <brian.dolbec@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:pending commit in: modules/
Date: Fri, 03 Jan 2014 05:03:25
Message-Id: 1388723962.20c1975bd68784bdcf37d0d95de96333881fc272.dol-sen@gentoo
1 commit: 20c1975bd68784bdcf37d0d95de96333881fc272
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 19 04:27:04 2013 +0000
4 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
5 CommitDate: Fri Jan 3 04:39:22 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=20c1975b
7
8 Fix a missed self.settings["repo_name"] migration
9
10 Use normpath() on it as well.
11 Fix the coding style in the lines touched.
12
13 ---
14 modules/generic_stage_target.py | 16 ++++++++++++----
15 1 file changed, 12 insertions(+), 4 deletions(-)
16
17 diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
18 index 6c8cdbc..ce43c79 100644
19 --- a/modules/generic_stage_target.py
20 +++ b/modules/generic_stage_target.py
21 @@ -174,10 +174,18 @@ class generic_stage_target(generic_target):
22
23 """ Setup our mount points """
24 if "SNAPCACHE" in self.settings:
25 - self.mounts=["proc", "dev", "portdir", "distdir", "port_tmpdir"]
26 - self.mountmap={"proc": "/proc", "dev": "/dev", "devpts": "/dev/pts",
27 - "portdir": self.settings["snapshot_cache_path"] + "/portage",
28 - "distdir": self.settings["distdir"], "port_tmpdir": "tmpfs"}
29 + self.mounts = ["proc", "dev", "portdir", "distdir", "port_tmpdir"]
30 + self.mountmap = {
31 + "dev": "/dev",
32 + "devpts": "/dev/pts",
33 + "distdir": self.settings["distdir"],
34 + "portdir": normpath("/".join([
35 + self.settings["snapshot_cache_path"],
36 + self.settings["repo_name"],
37 + ])),
38 + "port_tmpdir": "tmpfs",
39 + "proc": "/proc",
40 + }
41 else:
42 self.mounts = ["proc", "dev", "distdir", "port_tmpdir"]
43 self.mountmap = {"proc":"/proc", "dev":"/dev", "devpts":"/dev/pts",