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 257A1138247 for ; Fri, 3 Jan 2014 04:16:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62818E0AC7; Fri, 3 Jan 2014 04:16:37 +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 D0241E0ABF for ; Fri, 3 Jan 2014 04:16:36 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id C60FD33F5E7; Fri, 3 Jan 2014 04:16:35 +0000 (UTC) From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Cc: Brian Dolbec Subject: [gentoo-catalyst] [PATCH v3 2/6] Fix a missed self.settings["repo_name"] migration Date: Thu, 2 Jan 2014 20:16:18 -0800 Message-Id: <1388722582-27657-3-git-send-email-dolsen@gentoo.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1388722582-27657-1-git-send-email-dolsen@gentoo.org> References: <1388282230-3563-1-git-send-email-dolsen@gentoo.org> <1388722582-27657-1-git-send-email-dolsen@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: 861d4f3f-e0a6-4eea-b81d-51171299b632 X-Archives-Hash: 690fbd1c02ff02c933caebdea3babff5 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", -- 1.8.3.2