From: Gordon Hecker <gh@emlix.com>
Date: Wed, 27 May 2009 14:13:46 +0000 (+0200)
Subject: bugfix in e2-fetch-project: pass failure in e2-install-e2 to the user
X-Git-Tag: e2factory-2.3.1pre1~8
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=8970430e55efabb225207ce8cceaee85125300e9;p=e2factory.git

bugfix in e2-fetch-project: pass failure in e2-install-e2 to the user

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

diff --git a/global/e2-fetch-project.lua.in b/global/e2-fetch-project.lua.in
index 4f24f1c..d108888 100755
--- a/global/e2-fetch-project.lua.in
+++ b/global/e2-fetch-project.lua.in
@@ -174,18 +174,17 @@ end
 -- write project location file
 local file = ".e2/project-location"
 local data = string.format("%s\n", p.location)
-local rc, e = e2lib.write_file(file, data)
+local rc, re = e2lib.write_file(file, data)
 if not rc then
-  e2lib.abort(e)
+  e2lib.abort(e:cat(re))
 end
 
 -- call e2-install-e2
 e2_install_e2 = string.format("'%s' '%s/e2-install-e2'", 
 			buildconfig.LUA, buildconfig.TOOLDIR)
 rc, re = e2lib.callcmd_log(e2_install_e2)
-if not rc then
-	e:append("installing local e2 failed")
-	e2lib.abort(e:cat(re))
+if rc ~= 0 then
+	e2lib.abort(new_error("installing local e2 failed"))
 end
 e2lib.finish()