From f835cc1cf9d49ba01362aaefa26f79c6228eeed4 Mon Sep 17 00:00:00 2001 From: Gordon Hecker Date: Fri, 20 Nov 2009 09:47:36 +0100 Subject: [PATCH] bugfix: fix error checking in files.sourceid() Signed-off-by: Gordon Hecker --- local/files.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/local/files.lua b/local/files.lua index dd25f35..e925046 100644 --- a/local/files.lua +++ b/local/files.lua @@ -309,10 +309,11 @@ end -- @return string: the source id, nil on error -- @return an error string on error function files.sourceid(info, sourcename, sourceset) - local rc, e - rc, e = files.validate_source(info, sourcename) + local rc, re + local e = new_error("%s: error calculating sourceid", sourcename) + rc, re = files.validate_source(info, sourcename) if not rc then - return false, e + return false, re end local src = info.sources[sourcename] if src.sourceid then @@ -331,7 +332,7 @@ function files.sourceid(info, sourcename, sourceset) hash.hash_line(hc, licenceid) end for _,f in ipairs(src.file) do - local fileid = e2tool.fileid(info, f) + local fileid, re = e2tool.fileid(info, f) if not fileid then return false, e:cat(re) end -- 2.39.5