From: Tobias Ulmer <tu@emlix.com>
Date: Thu, 24 Apr 2014 17:04:30 +0000 (+0200)
Subject: Don't jump through hoops to get the source name
X-Git-Tag: e2factory-2.3.15rc1~205
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=905aa11f93eb697466102a9be598292089412e32;p=e2factory.git

Don't jump through hoops to get the source name

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---

diff --git a/plugins/collect_project.lua b/plugins/collect_project.lua
index 2f99200..8c46e5d 100644
--- a/plugins/collect_project.lua
+++ b/plugins/collect_project.lua
@@ -415,19 +415,17 @@ local function build_collect_project(info, resultname, return_flags)
             return false, e:cat(re)
         end
     end
-    for _,s in ipairs(cpres.sources) do
-        local src = info.sources[s]
-        e2lib.logf(3, "source: %s", s)
-        local destdir =
-            e2lib.join(res.build_config.T, "project", e2tool.sourcedir(s))
+    for _,sourcename in ipairs(cpres.sources) do
+        e2lib.logf(3, "source: %s", sourcename)
+        local destdir = e2lib.join(res.build_config.T, "project",
+            e2tool.sourcedir(sourcename))
         rc, re = e2lib.mkdir_recursive(destdir)
         if not rc then
             return false, e:cat(re)
         end
 
         local source_set = res.build_mode.source_set()
-        local files, re = scm.toresult(info, src.name, source_set,
-        destdir)
+        local files, re = scm.toresult(info, sourcename, source_set, destdir)
         if not files then
             return false, e:cat(re)
         end