| 1 |
Use normpath() on it as well. |
| 2 |
Fix the coding style in the lines touched. |
| 3 |
--- |
| 4 |
modules/generic_stage_target.py | 15 +++++++++++---- |
| 5 |
1 file changed, 11 insertions(+), 4 deletions(-) |
| 6 |
|
| 7 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
| 8 |
index 6c8cdbc..51375c0 100644 |
| 9 |
--- a/modules/generic_stage_target.py |
| 10 |
+++ b/modules/generic_stage_target.py |
| 11 |
@@ -174,10 +174,17 @@ class generic_stage_target(generic_target): |
| 12 |
|
| 13 |
""" Setup our mount points """ |
| 14 |
if "SNAPCACHE" in self.settings: |
| 15 |
- self.mounts=["proc", "dev", "portdir", "distdir", "port_tmpdir"] |
| 16 |
- self.mountmap={"proc": "/proc", "dev": "/dev", "devpts": "/dev/pts", |
| 17 |
- "portdir": self.settings["snapshot_cache_path"] + "/portage", |
| 18 |
- "distdir": self.settings["distdir"], "port_tmpdir": "tmpfs"} |
| 19 |
+ self.mounts = ["proc", "dev", "portdir", "distdir", "port_tmpdir"] |
| 20 |
+ self.mountmap = { |
| 21 |
+ "proc": "/proc", |
| 22 |
+ "dev": "/dev", |
| 23 |
+ "devpts": "/dev/pts", |
| 24 |
+ "portdir": normpath("/".join([ |
| 25 |
+ self.settings["snapshot_cache_path"], |
| 26 |
+ self.settings["repo_name"], |
| 27 |
+ ])), |
| 28 |
+ "distdir": self.settings["distdir"], |
| 29 |
+ "port_tmpdir": "tmpfs"} |
| 30 |
else: |
| 31 |
self.mounts = ["proc", "dev", "distdir", "port_tmpdir"] |
| 32 |
self.mountmap = {"proc":"/proc", "dev":"/dev", "devpts":"/dev/pts", |
| 33 |
-- |
| 34 |
1.8.3.2 |
Archives