]> git.e2factory.org Git - e2factory.git/commitdiff
bugfix: error checking in buildid calculation
authorGordon Hecker <gh@emlix.com>
Tue, 9 Jun 2009 12:25:25 +0000 (14:25 +0200)
committerGordon Hecker <gh@emlix.com>
Tue, 9 Jun 2009 12:25:34 +0000 (14:25 +0200)
Signed-off-by: Gordon Hecker <gh@emlix.com>
local/e2tool.lua

index 560fdaba21fdebbe49541370318e84daaf3b97fa..967aa88ad0150ecb4f121216b2c596af87e052c9 100644 (file)
@@ -1373,13 +1373,20 @@ function e2tool.pbuildid(info, resultname)
        hc:hash_line(projid)            -- project id
        hash.hash_line(hc, r.resultid)  -- result id
        for _,d in ipairs(r.depends) do
-               local id = e2tool.pbuildid(info, d)
+               local id, re = e2tool.pbuildid(info, d)
+               if not id then
+                       e2lib.abort(re)
+               end
                hash.hash_line(hc, id)          -- buildid of dependency
        end
        for _,c in ipairs(r.collect_project_results) do
                local res = info.results[c]
                                        -- pbuildids of collected results
-               hash.hash_line(hc, e2tool.pbuildid(info, c))
+               local pbid, re = e2tool.pbuildid(info, c)
+               if not pbid then
+                       e2lib.abort(re)
+               end
+               hash.hash_line(hc, pbid)
        end
        e2lib.log(4, string.format("hash data for resultid %s\n%s", 
                                                        resultname, hc.data))