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: Tue, 31 Dec 2013 04:22:15
Message-Id: 1388450374.09ea211964c280092b397f6b70de731ad23f2259.dol-sen@gentoo
1 commit: 09ea211964c280092b397f6b70de731ad23f2259
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: Tue Dec 31 00:39:34 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=09ea2119
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 | 15 +++++++++++----
15 1 file changed, 11 insertions(+), 4 deletions(-)
16
17 diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
18 index 6c8cdbc..51375c0 100644
19 --- a/modules/generic_stage_target.py
20 +++ b/modules/generic_stage_target.py
21 @@ -174,10 +174,17 @@ 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 + "proc": "/proc",
32 + "dev": "/dev",
33 + "devpts": "/dev/pts",
34 + "portdir": normpath("/".join([
35 + self.settings["snapshot_cache_path"],
36 + self.settings["repo_name"],
37 + ])),
38 + "distdir": self.settings["distdir"],
39 + "port_tmpdir": "tmpfs"}
40 else:
41 self.mounts = ["proc", "dev", "distdir", "port_tmpdir"]
42 self.mountmap = {"proc":"/proc", "dev":"/dev", "devpts":"/dev/pts",