From: Gordon Hecker <gh@emlix.com>
Date: Mon, 18 Jan 2010 11:18:25 +0000 (+0100)
Subject: cache: remove the feature of having a per-project cache
X-Git-Tag: e2factory-2.3.4pre1~49
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=c904fc6aa743b2977754535467ce2dde497c3f97;p=e2factory.git

cache: remove the feature of having a per-project cache

Signed-off-by: Gordon Hecker <gh@emlix.com>
---

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index 3e0e032..9ceb72b 100644
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -1894,7 +1894,6 @@ function e2lib.setup_cache()
   if type(config.cache) ~= "table" or type(config.cache.path) ~= "string" then
     return false, e:append("invalid cache configuration: config.cache.path")
   end
-  -- replace %u by the username, %l by the project location
   local replace = { u=e2lib.username }
   local cache_path = e2lib.format_replace(config.cache.path, replace)
   local cache_url = string.format("file://%s", cache_path)
diff --git a/global/e2.conf.in b/global/e2.conf.in
index 841ab21..0130649 100644
--- a/global/e2.conf.in
+++ b/global/e2.conf.in
@@ -22,12 +22,7 @@ config {
 		scp = { name="scp", flags="-o BatchMode=true" },
 	},
 	cache = {
-		-- replacements:
-		-- %u: username
-		-- %l: project-location
-		-- to keep the projects independent use
-		--path = "/var/tmp/e2cache/%u/%l",
-		-- to maintain one cache for all projects use
+		-- replacements: %u: username
 		path = "/var/tmp/e2cache-%u",
 	},
 	servers = {