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 3e0e032d2cc30ef9be98edca448e35a183e2e9ac..9ceb72bb2cd439c4b0afd72e31f1a7a04b1f0499 100644 (file)
--- 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 841ab214aba027f55c6e1acd9a682a96b493a008..01306490fa24a73d3c76e7c070ff9243c69d61fa 100644 (file)
--- 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 = {