]> git.e2factory.org Git - e2factory.git/commitdiff
files: turn on mergeing in file licence lists
authorTobias Ulmer <tu@emlix.com>
Wed, 26 Oct 2016 15:43:00 +0000 (17:43 +0200)
committerTobias Ulmer <tu@emlix.com>
Wed, 16 Nov 2016 14:41:18 +0000 (15:41 +0100)
Signed-off-by: Tobias Ulmer <tu@emlix.com>
plugins/files.lua

index 68b9bcd869a106ff881e457d2e28694bd510f62f..ae0d18350f73792773b01ed2e4a7ffd4695bd576 100644 (file)
@@ -179,7 +179,7 @@ function files.files_source:initialize(rawsrc)
             end
 
             licences = self:get_licences()
-            llist = sl.sl:new(false, true)
+            llist = sl.sl:new(true)
 
             for _,licencename in ipairs(f.licences) do
                 if not licence.licences[licencename] then
@@ -187,10 +187,10 @@ function files.files_source:initialize(rawsrc)
                         laerr, licencename))
                 end
 
-                -- Make sure the _licences list contains every licence in the
-                -- entire source. Duplicates are rejected by unique string list.
+                -- Make sure the main licences list contains every licence in
+                -- the entire source.
                 licences:insert(licencename)
-                assert(llist:insert(licencename))
+                llist:insert(licencename)
             end
 
             self:set_licences(licences)