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 15E90138247 for ; Fri, 3 Jan 2014 04:17:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9892BE0AEC; Fri, 3 Jan 2014 04:16:39 +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 09FE2E0AE6 for ; Fri, 3 Jan 2014 04:16:38 +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 04BA033F6AD; Fri, 3 Jan 2014 04:16:37 +0000 (UTC) From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Cc: Brian Dolbec Subject: [gentoo-catalyst] [PATCH v3 6/6] Set mountmap["icecream"] from settings for now. Date: Thu, 2 Jan 2014 20:16:22 -0800 Message-Id: <1388722582-27657-7-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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 302d0f51-0f87-4a09-9be4-5fb5e8832061 X-Archives-Hash: 6f9907d8ff8000973a4ce018988301ee “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 c57c504..c6a06b6 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"] -- 1.8.3.2