From: Tobias Ulmer <tu@emlix.com>
Date: Tue, 29 Nov 2016 15:33:11 +0000 (+0100)
Subject: environment: rename id() to envid()
X-Git-Tag: e2factory-2.3.16rc1~42
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=0d339c2bafa2dd5f343717b126c4e1147918de7d;p=e2factory.git

environment: rename id() to envid()

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

diff --git a/local/environment.lua b/local/environment.lua
index 9f23f86..f23b634 100644
--- a/local/environment.lua
+++ b/local/environment.lua
@@ -54,7 +54,7 @@ end
 
 --- return a hash representing the environment
 -- @param env environment
-function environment.id(env)
+function environment.envid(env)
     assertIsTable(env)
     assertIsTable(env.sorted)
     local hc = hash.hash_start()
diff --git a/local/result.lua b/local/result.lua
index 5ba529d..bb07af6 100644
--- a/local/result.lua
+++ b/local/result.lua
@@ -500,7 +500,7 @@ function result.result_class:buildid()
     end
 
     -- environment
-    hash.hash_append(hc, self:merged_env():id())
+    hash.hash_append(hc, self:merged_env():envid())
 
     -- buildscript
     local file = e2tool.file_class:new(
diff --git a/plugins/cvs.lua b/plugins/cvs.lua
index acb0b52..652182b 100644
--- a/plugins/cvs.lua
+++ b/plugins/cvs.lua
@@ -220,7 +220,7 @@ function cvs.cvs_source:sourceid(sourceset)
     hc = hash.hash_start()
     hash.hash_append(hc, self._name)
     hash.hash_append(hc, self._type)
-    hash.hash_append(hc, self._env:id())
+    hash.hash_append(hc, self._env:envid())
     licences = self:get_licences()
     for licencename in licences:iter() do
         lid, re = licence.licences[licencename]:licenceid(info)
diff --git a/plugins/files.lua b/plugins/files.lua
index b7ae218..525c8dc 100644
--- a/plugins/files.lua
+++ b/plugins/files.lua
@@ -249,7 +249,7 @@ function files.files_source:sourceid(sourceset --[[always ignored for files]])
     hc = hash.hash_start()
     hash.hash_append(hc, self._name)
     hash.hash_append(hc, self._type)
-    hash.hash_append(hc, self._env:id())
+    hash.hash_append(hc, self._env:envid())
 
     -- all licences
     for licencename in self:get_licences():iter() do
diff --git a/plugins/git.lua b/plugins/git.lua
index bb32eb9..7c976dc 100644
--- a/plugins/git.lua
+++ b/plugins/git.lua
@@ -198,7 +198,7 @@ function git.git_source:sourceid(sourceset)
     hc = hash.hash_start()
     hash.hash_append(hc, self._name)
     hash.hash_append(hc, self._type)
-    hash.hash_append(hc, self._env:id())
+    hash.hash_append(hc, self._env:envid())
 
     licences = self:get_licences()
     for licencename in licences:iter() do
diff --git a/plugins/svn.lua b/plugins/svn.lua
index d993ce2..cdc099d 100644
--- a/plugins/svn.lua
+++ b/plugins/svn.lua
@@ -275,7 +275,7 @@ function svn.svn_source:sourceid(sourceset)
     hc = hash.hash_start()
     hash.hash_append(hc, self._name)
     hash.hash_append(hc, self._type)
-    hash.hash_append(hc, self._env:id())
+    hash.hash_append(hc, self._env:envid())
 
     info = e2tool.info()
     assert(type(info) == "table")