From: Brian Dolbec <dolsen@gentoo.org>
Date: Fri, 20 Dec 2013 00:07:15 +0000 (-0800)
Subject: Set mountmap["icecream"] from settings for now.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75f383147ce74c5de6e09d80a8ae43f982fc24c4;p=catalyst.git

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.
---

diff --git a/catalyst b/catalyst
index 82b09422..cb6c0226 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 63a8ff5a..7919f072 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -250,8 +250,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"]