From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-654029-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 B3D38138247
for <garchives@archives.gentoo.org>; Mon, 30 Dec 2013 01:44:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 00962E0B0D;
Mon, 30 Dec 2013 01:44:53 +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 704B8E0AA9
for <gentoo-commits@lists.gentoo.org>; Mon, 30 Dec 2013 01:44:52 +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 9BF0733F781
for <gentoo-commits@lists.gentoo.org>; Mon, 30 Dec 2013 01:44:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id D8DEEE5537
for <gentoo-commits@lists.gentoo.org>; Mon, 30 Dec 2013 01:44:48 +0000 (UTC)
From: "Brian Dolbec" <brian.dolbec@gmail.com>
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" <brian.dolbec@gmail.com>
Message-ID: <1388343246.3ca3cbcfd8719b95d23c9aad77f27c3ba1a3efd6.dol-sen@gentoo>
Subject: [gentoo-commits] proj/catalyst:pending commit in: /, modules/
X-VCS-Repository: proj/catalyst
X-VCS-Files: catalyst modules/generic_stage_target.py
X-VCS-Directories: / modules/
X-VCS-Committer: dol-sen
X-VCS-Committer-Name: Brian Dolbec
X-VCS-Revision: 3ca3cbcfd8719b95d23c9aad77f27c3ba1a3efd6
X-VCS-Branch: pending
Date: Mon, 30 Dec 2013 01:44:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: dafefcbe-c7c0-4b62-8de1-c41665625d19
X-Archives-Hash: 422b3d7183d7b7578ee3301e1654f890
commit: 3ca3cbcfd8719b95d23c9aad77f27c3ba1a3efd6
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 00:07:15 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Dec 29 18:54:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=3ca3cbcf
Set mountmap["icecream"] from settings for now.
“mountmap” is for source paths. “mounts” is for path-agnostic keys.
I plan to add a source_mounts to settings later to compliment the target_mounts paths.
---
catalyst | 1 +
modules/generic_stage_target.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/catalyst b/catalyst
index 82b0942..cb6c022 100755
--- a/catalyst
+++ b/catalyst
@@ -66,6 +66,7 @@ def parse_config(myconfig):
confdefaults = {
"distdir": "/usr/portage/distfiles",
"hash_function": "crc32",
+ "icecream": "/var/cache/icecream",
"local_overlay": "/usr/local/portage",
"options": "",
"packagedir": "/usr/portage/packages",
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 8d98e58..bbea57a 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -249,8 +249,8 @@ class generic_stage_target(generic_target):
self.env["CCACHE_DIR"] = self.target_mounts["ccache"]
if "ICECREAM" in self.settings:
- self.mounts.append("/var/cache/icecream")
- self.mountmap["/var/cache/icecream"]="/var/cache/icecream"
+ self.mounts.append("icecream")
+ self.mountmap["icecream"] = self.settings["icecream"]
self.env["PATH"] = self.target_mounts["icecream"] + ":" + \
self.env["PATH"]