sl: merging duplicates is the default now

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

diff --git a/local/e2tool.lua b/local/e2tool.lua
index 76e65e19604369a2b47d5077156a26d6c9dabd3c..290dcb2abf1a34c7ae0f81197374f6fa5b046318 100644 (file)
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -553,7 +553,7 @@ function e2tool.dlist_recursive(resultv)
         assertIsTable(result.results[resultv])
         depends = result.results[resultv]:depends_list()
     else
-        depends = sl.sl:new(true)
+        depends = sl.sl:new()
         depends:insert_table(resultv)
     end
 

diff --git a/local/result.lua b/local/result.lua
index eb86c046fb8af7f9859a6752d12920680298d2b9..741fc4ba34570a7acd93cf775232f2d5316a05c5 100644 (file)
--- a/local/result.lua
+++ b/local/result.lua
@@ -204,10 +204,10 @@ function result.result_class:initialize(rawres)
 
     result.basic_result.initialize(self, rawres)
 
-    self._depends_list = sl.sl:new(true)
+    self._depends_list = sl.sl:new()
     self._buildid = false
-    self._sources_list = sl.sl:new(true)
-    self._chroot_list = sl.sl:new(true)
+    self._sources_list = sl.sl:new()
+    self._chroot_list = sl.sl:new()
     self._env = environment.new()
     self._build_mode = false
     self._build_settings = false

diff --git a/local/source.lua b/local/source.lua
index e2500fbf28ad8a4fac8c6a13eced4e52b602a863..4a432d7465f13ea0d15eb3ae3a4c775b2e4f7117 100644 (file)
--- 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(true)
+    licences = sl.sl:new()
 
     --[[if not rawsrc.licences and rawsrc.licence then
         e2lib.warnf("WDEPRECATED", "in source %s:", src.name)

diff --git a/plugins/collect_project.lua b/plugins/collect_project.lua
index a3d98aa31048b29ceb895391c4a359b707dbd2d5..75837e3de16916795da1be344b914cb3e814b5ba 100644 (file)
--- a/plugins/collect_project.lua
+++ b/plugins/collect_project.lua
@@ -110,10 +110,10 @@ local function _build_collect_project(self, res, return_flags)
     local out, rc, re, info
     local bc = res:build_config()
     local e = err.new("providing project data to this build failed")
-    local cp_sources = sl.sl:new(true, false)
-    local cp_depends = sl.sl:new(true, false)
-    local cp_chroot = sl.sl:new(true, false)
-    local cp_licences = sl.sl:new(true, false)
+    local cp_sources = sl.sl:new()
+    local cp_depends = sl.sl:new()
+    local cp_chroot = sl.sl:new()
+    local cp_licences = sl.sl:new()
 
     info = e2tool.info()
 

diff --git a/plugins/files.lua b/plugins/files.lua
index ae0d18350f73792773b01ed2e4a7ffd4695bd576..365762ab79eaae821746e888e5f0c0a2ea45a037 100644 (file)
--- 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(true)
+            llist = sl.sl:new()
 
             for _,licencename in ipairs(f.licences) do
                 if not licence.licences[licencename] then