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 0E3831387B1 for ; Fri, 20 Dec 2013 00:48:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3ACB2E0BAA; Fri, 20 Dec 2013 00:48:40 +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 944C4E0BA4 for ; Fri, 20 Dec 2013 00:48:39 +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 691EC33F611 for ; Fri, 20 Dec 2013 00:48:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E937219002B for ; Fri, 20 Dec 2013 00:48:36 +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: <1387500420.a373e3b4548adcb63974419a568d1bdb6aa5e01c.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: a373e3b4548adcb63974419a568d1bdb6aa5e01c X-VCS-Branch: pending Date: Fri, 20 Dec 2013 00:48:36 +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: b59b2547-4c70-4e2c-af46-f89266e7a359 X-Archives-Hash: e938952f3aa76a4083d133d03f76ee92 commit: a373e3b4548adcb63974419a568d1bdb6aa5e01c Author: Brian Dolbec gentoo org> AuthorDate: Fri Dec 20 00:07:15 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Dec 20 00:47:00 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a373e3b4 Set mountmap["icecream"] from settings for now. mounts and mountmap are source paths. 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 c8d31e1..43df545 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -243,8 +243,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"]