From: Gordon Hecker <gh@emlix.com>
Date: Mon, 22 Mar 2010 11:10:03 +0000 (+0100)
Subject: bugfix: fix error handling for misconfigured files in source configuration
X-Git-Tag: e2factory-2.3.4rc2~5
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=60ecc336ffa8b13bee12399180ea2696c317025d;p=e2factory.git

bugfix: fix error handling for misconfigured files in source configuration

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

diff --git a/generic/cache.lua b/generic/cache.lua
index c8041a4..8afd5f3 100644
--- a/generic/cache.lua
+++ b/generic/cache.lua
@@ -427,7 +427,7 @@ function cache_file(cache, server, location, flags)
 	e2lib.log(4, string.format("cache_file(): %s %s %s %s",
 		tostring(cache), tostring(server), tostring(location), 
 		tostring(flags)))
-	local e = new_error("caching file failed")
+	local e = new_error("caching file failed: %s:%s", server, location)
 	local rc, re
 	local ce, re = ce_by_server(cache, server)
 	if not ce then
diff --git a/local/e2tool.lua b/local/e2tool.lua
index 5f413e3..81c0766 100644
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -1280,15 +1280,15 @@ function hashcache_write(info)
 end
 
 function hashcache(info, file)
-	local e = new_error("getting fileid from hash cache")
+	local e = new_error("getting fileid from hash cache failed")
 	local rc, re, fileid
 	local p, re = info.cache:file_path(file.server,	file.location, {})
 	if not p then
 		return nil, e:cat(re)
 	end
-	local s = e2util.stat(p)
+	local s, msg = e2util.stat(p)
 	if not s then
-		return nil, e:cat(new_error("stat() failed"))
+		return nil, new_error("%s: %s", p, msg)
 	end
 	local id = string.format("%s:%s", file.server, file.location)
 	local fileid
@@ -1324,7 +1324,7 @@ end
 -- @return an error object on failure
 function verify_remote_fileid(info, file, fileid)
 	local rc, re
-	local e = new_error("error calculating remote file id for file %s:%s",
+	local e = new_error("error calculating remote file id for file: %s:%s",
 						file.server, file.location)
 	if not info.cache:cache_enabled(file.server) or
 	   not e2option.opts["check-remote"] then
@@ -1379,7 +1379,7 @@ end
 function fileid(info, file)
 	local fileid
 	local re
-	local e = new_error("error calculating file id for file %s:%s",
+	local e = new_error("error calculating file id for file: %s:%s",
 						file.server, file.location)
 	if file.sha1 then
 		fileid = file.sha1
@@ -1479,7 +1479,8 @@ end
 -- @return the buildid
 function pbuildid(info, resultname)
 	e2lib.log(4, string.format("get pbuildid for %s", resultname))
-	local e = new_error("calculating result id failed")
+	local e = new_error("error calculating result id for result: %s",
+								resultname)
 	local r = info.results[resultname]
 	if r.pbuildid then
 		return r.build_mode.buildid(r.pbuildid)
diff --git a/local/files.lua b/local/files.lua
index 0bedde8..6e9250d 100644
--- a/local/files.lua
+++ b/local/files.lua
@@ -310,7 +310,8 @@ end
 -- @return an error string on error
 function files.sourceid(info, sourcename, sourceset)
 	local rc, re
-	local e = new_error("%s: error calculating sourceid", sourcename)
+	local e = new_error("error calculating sourceid for source: %s",
+								sourcename)
 	rc, re = files.validate_source(info, sourcename)
 	if not rc then
 		return false, re