bugfix: include username in chroot location format string

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

diff --git a/Changelog b/Changelog
index 303dcc403b7bff0998066e79958691c8e76e3763..2b6d3e0a6e11b7e842d2ba15556a9e413d13612c 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 NEXT:
  * a serious bug in the hashcache was fixed. The buildid calculation
    used outdated hash of files from the project tree.
+ * the username is included in the chroot environment path again
 
 e2factory-2.3.4pre3
  * the plugin interface was extended to allow plugins to change the

diff --git a/local/e2build.lua b/local/e2build.lua
index 82af1395c6ed9cfd187fdceefe1e9f4787974b14..979858d0b4f56f7b8433c56c80c1f2e5ad350557 100644 (file)
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -163,9 +163,10 @@ function build_config(info, r)
   end
   res.build_config = {} -- build up a new build config
   local tab = res.build_config
-  local tmpdir = string.format("%s/e2factory-%s.%s.%s-build",
+  local tmpdir = string.format("%s/e2factory-%s.%s.%s-build/%s",
                e2lib.globals.tmpdir,
-               buildconfig.MAJOR, buildconfig.MINOR, buildconfig.PATCHLEVEL)
+               buildconfig.MAJOR, buildconfig.MINOR, buildconfig.PATCHLEVEL,
+               e2lib.globals.username)
   local project = info.name
   local builddir = "tmp/e2"
   tab.mode = nil -- XXX