]> git.e2factory.org Git - e2factory.git/commitdiff
source: auto merge licence names
authorTobias Ulmer <tu@emlix.com>
Wed, 26 Oct 2016 15:44:42 +0000 (17:44 +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>
local/source.lua

index d6572adc4b06d67df411fdc7cbfbc98eb7a4451b..e2500fbf28ad8a4fac8c6a13eced4e52b602a863 100644 (file)
@@ -291,7 +291,7 @@ function source.generic_source_validate_licences(rawsrc, src)
 
     local rc, re, licences
 
-    licences = sl.sl:new(false, true --[[unique]])
+    licences = sl.sl:new(true)
 
     --[[if not rawsrc.licences and rawsrc.licence then
         e2lib.warnf("WDEPRECATED", "in source %s:", src.name)
@@ -326,7 +326,7 @@ function source.generic_source_validate_licences(rawsrc, src)
         if not licence.licences[licencename] then
             return false, err.new("unknown licence: %s", licencename)
         end
-        assert(licences:insert(licencename))
+        licences:insert(licencename)
     end
 
     src:set_licences(licences)