From 20c1975bd68784bdcf37d0d95de96333881fc272 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Wed, 18 Dec 2013 20:27:04 -0800 Subject: [PATCH] Fix a missed self.settings["repo_name"] migration Use normpath() on it as well. Fix the coding style in the lines touched. --- modules/generic_stage_target.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 6c8cdbc2..ce43c79e 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -174,10 +174,18 @@ class generic_stage_target(generic_target): """ Setup our mount points """ if "SNAPCACHE" in self.settings: - self.mounts=["proc", "dev", "portdir", "distdir", "port_tmpdir"] - self.mountmap={"proc": "/proc", "dev": "/dev", "devpts": "/dev/pts", - "portdir": self.settings["snapshot_cache_path"] + "/portage", - "distdir": self.settings["distdir"], "port_tmpdir": "tmpfs"} + self.mounts = ["proc", "dev", "portdir", "distdir", "port_tmpdir"] + self.mountmap = { + "dev": "/dev", + "devpts": "/dev/pts", + "distdir": self.settings["distdir"], + "portdir": normpath("/".join([ + self.settings["snapshot_cache_path"], + self.settings["repo_name"], + ])), + "port_tmpdir": "tmpfs", + "proc": "/proc", + } else: self.mounts = ["proc", "dev", "distdir", "port_tmpdir"] self.mountmap = {"proc":"/proc", "dev":"/dev", "devpts":"/dev/pts", -- 2.26.2