From: Gordon Hecker <gh@emlix.com>
Date: Thu, 11 Mar 2010 13:59:53 +0000 (+0100)
Subject: bugfix: include username in chroot location format string
X-Git-Tag: e2factory-2.3.4rc1~2
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=5c0a674cda8c85fa4d59f5bc8cbb3e25708413f0;p=e2factory.git

bugfix: include username in chroot location format string

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

diff --git a/Changelog b/Changelog
index 303dcc4..2b6d3e0 100644
--- 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 82af139..979858d 100644
--- 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