]> git.e2factory.org Git - e2factory.git/commitdiff
Don't jump through hoops to get the source name
authorTobias Ulmer <tu@emlix.com>
Thu, 24 Apr 2014 17:04:30 +0000 (19:04 +0200)
committerTobias Ulmer <tu@emlix.com>
Wed, 16 Nov 2016 14:41:17 +0000 (15:41 +0100)
Signed-off-by: Tobias Ulmer <tu@emlix.com>
plugins/collect_project.lua

index 2f99200c44cadd01d8c0ae44e6335d6df34b0c4c..8c46e5d6d72b6b0b26b8eab6d2a477047374d030 100644 (file)
@@ -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