From 591ae25780b67e81f072cb095cf6f108493c3713 Mon Sep 17 00:00:00 2001
From: Tobias Ulmer <tu@emlix.com>
Date: Wed, 30 Nov 2016 16:08:11 +0100
Subject: [PATCH] licence: remove info arg from licenceid()

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---
 local/e2tool.lua  | 5 ++---
 local/licence.lua | 5 +----
 plugins/cvs.lua   | 7 ++-----
 plugins/files.lua | 7 ++-----
 plugins/git.lua   | 2 +-
 plugins/svn.lua   | 8 ++++----
 6 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/local/e2tool.lua b/local/e2tool.lua
index 10f11fb..7bf7b8b 100644
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -216,8 +216,7 @@ function e2tool.file_class:fileid()
         end
     end
 
-    local hc, info
-    info = e2tool.info()
+    local hc
     hc = hash.hash_start()
     hash.hash_append(hc, self._server)
     hash.hash_append(hc, self._location)
@@ -228,7 +227,7 @@ function e2tool.file_class:fileid()
         local lid
 
         for licencename in self._licences:iter() do
-            local lid, re = licence.licences[licencename]:licenceid(info)
+            local lid, re = licence.licences[licencename]:licenceid()
             if not lid then
                 return false, e:cat(re)
             end
diff --git a/local/licence.lua b/local/licence.lua
index fbfa060..74c07fb 100644
--- a/local/licence.lua
+++ b/local/licence.lua
@@ -107,12 +107,9 @@ function licence.licence:get_name()
 end
 
 --- Calculate the LicenceID
--- @param info Info table.
 -- @return LicenceID or false on error.
 -- @return Error object on failure.
-function licence.licence:licenceid(info)
-    assert(type(info) == "table", "info invalid")
-
+function licence.licence:licenceid()
     local rc, re, e, hc, fileid
 
     if self._licenceid then
diff --git a/plugins/cvs.lua b/plugins/cvs.lua
index 652182b..57b2159 100644
--- a/plugins/cvs.lua
+++ b/plugins/cvs.lua
@@ -208,22 +208,19 @@ end
 function cvs.cvs_source:sourceid(sourceset)
     assert(type(sourceset) == "string" and #sourceset > 0)
 
-    local rc, re, hc, lid, info, licences
+    local rc, re, hc, lid, licences
 
     if self._sourceids[sourceset] then
         return self._sourceids[sourceset]
     end
 
-    info = e2tool.info()
-    assert(type(info) == "table")
-
     hc = hash.hash_start()
     hash.hash_append(hc, self._name)
     hash.hash_append(hc, self._type)
     hash.hash_append(hc, self._env:envid())
     licences = self:get_licences()
     for licencename in licences:iter() do
-        lid, re = licence.licences[licencename]:licenceid(info)
+        lid, re = licence.licences[licencename]:licenceid()
         if not lid then
             return false, re
         end
diff --git a/plugins/files.lua b/plugins/files.lua
index cf5984d..e215cae 100644
--- a/plugins/files.lua
+++ b/plugins/files.lua
@@ -237,15 +237,12 @@ function files.files_source:file_iter()
 end
 
 function files.files_source:sourceid(sourceset --[[always ignored for files]])
-    local hc, info, licences
+    local hc, licences
 
     if self._sourceid then
         return self._sourceid
     end
 
-    info = e2tool.info()
-    assert(info)
-
     hc = hash.hash_start()
     hash.hash_append(hc, self._name)
     hash.hash_append(hc, self._type)
@@ -253,7 +250,7 @@ function files.files_source:sourceid(sourceset --[[always ignored for files]])
 
     -- all licences
     for licencename in self:get_licences():iter() do
-        local lid, re = licence.licences[licencename]:licenceid(info)
+        local lid, re = licence.licences[licencename]:licenceid()
         if not lid then
             return false, re
         end
diff --git a/plugins/git.lua b/plugins/git.lua
index 7c976dc..87a204f 100644
--- a/plugins/git.lua
+++ b/plugins/git.lua
@@ -202,7 +202,7 @@ function git.git_source:sourceid(sourceset)
 
     licences = self:get_licences()
     for licencename in licences:iter() do
-        local lid, re = licence.licences[licencename]:licenceid(info)
+        local lid, re = licence.licences[licencename]:licenceid()
         if not lid then
             return false, re
         end
diff --git a/plugins/svn.lua b/plugins/svn.lua
index cdc099d..0600742 100644
--- a/plugins/svn.lua
+++ b/plugins/svn.lua
@@ -277,18 +277,18 @@ function svn.svn_source:sourceid(sourceset)
     hash.hash_append(hc, self._type)
     hash.hash_append(hc, self._env:envid())
 
-    info = e2tool.info()
-    assert(type(info) == "table")
-
     licences = self:get_licences()
     for licencename in licences:iter() do
-        lid, re = licence.licences[licencename]:licenceid(info)
+        lid, re = licence.licences[licencename]:licenceid()
         if not lid then
             return false, re
         end
         hash.hash_append(hc, lid)
     end
 
+    info = e2tool.info()
+    assert(type(info) == "table")
+
     surl, re = cache.remote_url(info.cache, self._server, self._location)
     if not surl then
         return false, re
-- 
2.39.5