From: Tobias Ulmer <tu@emlix.com>
Date: Wed, 26 Oct 2016 15:44:42 +0000 (+0200)
Subject: source: auto merge licence names
X-Git-Tag: e2factory-2.3.15rc1~49
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=5e5f080336866ecd7c14fa9dd80ef179fed9e44d;p=e2factory.git

source: auto merge licence names

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

diff --git a/local/source.lua b/local/source.lua
index d6572ad..e2500fb 100644
--- a/local/source.lua
+++ b/local/source.lua
@@ -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)