From: Tobias Ulmer <tu@emlix.com>
Date: Wed, 26 Oct 2016 15:43:00 +0000 (+0200)
Subject: files: turn on mergeing in file licence lists
X-Git-Tag: e2factory-2.3.15rc1~51
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=d93d22c608182f8a36c85059c0d7f039f40936b5;p=e2factory.git

files: turn on mergeing in file licence lists

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

diff --git a/plugins/files.lua b/plugins/files.lua
index 68b9bcd..ae0d183 100644
--- a/plugins/files.lua
+++ b/plugins/files.lua
@@ -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)