From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 90F0F1387B1 for ; Tue, 31 Dec 2013 04:39:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3488E0A9B; Tue, 31 Dec 2013 04:39:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E487E0A9B for ; Tue, 31 Dec 2013 04:39:27 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C1FC33F6CB for ; Tue, 31 Dec 2013 04:39:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0F7E5E545E for ; Tue, 31 Dec 2013 04:39:25 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1388464408.a83d4df507612cbb30d12eabe1087aa19c995eb9.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/generic_stage_target.py X-VCS-Directories: modules/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: a83d4df507612cbb30d12eabe1087aa19c995eb9 X-VCS-Branch: pending Date: Tue, 31 Dec 2013 04:39:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f15eae35-8dcf-4bd0-b9b6-32fb1c8dd3a5 X-Archives-Hash: c3e5d772c95e3cb3f7637773be02d529 commit: a83d4df507612cbb30d12eabe1087aa19c995eb9 Author: Brian Dolbec gentoo org> AuthorDate: Thu Dec 19 04:27:04 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Tue Dec 31 04:33:28 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a83d4df5 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 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 6c8cdbc..3d6a45e 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -174,10 +174,17 @@ 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",