environment: rename id() to envid()

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

diff --git a/local/environment.lua b/local/environment.lua
index 9f23f86d6822723e927aad701f0bdb49d7387b2f..f23b634f1c9e732dba131153cd1bdf90658bf9b5 100644 (file)
--- 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 5ba529dd8d9d07e10c2ea5cff3b221d4f2fc16bc..bb07af6adf3d1760373a9f58a9572fcdf1d22bd3 100644 (file)
--- 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 acb0b5287b6cdc139732dde836880938288b2599..652182b62e7b274737542353e84790d0cc1ff4db 100644 (file)
--- 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 b7ae21843a1d6bab872aded46cb73c6bab0af30b..525c8dc6046559d01aa415d280bb7d4695242d1e 100644 (file)
--- 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 bb32eb90ee6762915241a9ef35ae49d1a92e2718..7c976dcf81e2e82905c03e6c0e5233106baad9f9 100644 (file)
--- 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 d993ce22e0de95a9fd91dca496c3ca46c6061a35..cdc099d943d688da764d9212e68c4e2feb795acd 100644 (file)
--- 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")