From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-catalyst+bounces-3035-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 760DF138247
for <garchives@archives.gentoo.org>; Fri, 3 Jan 2014 05:09:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C517DE09C0;
Fri, 3 Jan 2014 05:09:10 +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 5B5D5E09C0
for <gentoo-catalyst@lists.gentoo.org>; Fri, 3 Jan 2014 05:09:10 +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 01E9D33F5C8;
Fri, 3 Jan 2014 05:09:08 +0000 (UTC)
From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Brian Dolbec <dolsen@gentoo.org>
Subject: [gentoo-catalyst] [PATCH v5 1/1] Fix a missed self.settings["repo_name"] migration
Date: Thu, 2 Jan 2014 21:09:01 -0800
Message-Id: <1388725741-29853-1-git-send-email-dolsen@gentoo.org>
X-Mailer: git-send-email 1.8.3.2
In-Reply-To: <1388722582-27657-3-git-send-email-dolsen@gentoo.org>
References: <1388722582-27657-3-git-send-email-dolsen@gentoo.org>
Precedence: bulk
List-Post: <mailto:gentoo-catalyst@lists.gentoo.org>
List-Help: <mailto:gentoo-catalyst+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-catalyst+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-catalyst+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-catalyst.gentoo.org>
X-BeenThere: gentoo-catalyst@lists.gentoo.org
Reply-to: gentoo-catalyst@lists.gentoo.org
X-Archives-Salt: 6af25f27-4d84-4d24-a89b-99260ddb49f1
X-Archives-Hash: 3734e84f4a0fdcd72521a47ddf6833d6
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 6c8cdbc..ce43c79 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",
--
1.8.3.2