From: Tobias Ulmer Date: Mon, 9 May 2016 17:23:03 +0000 (+0200) Subject: cvs: use hash_append X-Git-Tag: e2factory-2.3.15rc1~171 X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=8934e7ef41d22bf02924c47a7d5a685cbef8eebb;p=e2factory.git cvs: use hash_append Signed-off-by: Tobias Ulmer --- diff --git a/plugins/cvs.lua b/plugins/cvs.lua index d0eedac..c12391d 100644 --- a/plugins/cvs.lua +++ b/plugins/cvs.lua @@ -228,21 +228,21 @@ function cvs.cvs_source:sourceid(sourceset) assert(type(info) == "table") hc = hash.hash_start() - hash.hash_line(hc, self._name) - hash.hash_line(hc, self._type) - hash.hash_line(hc, self._env:id()) + hash.hash_append(hc, self._name) + hash.hash_append(hc, self._type) + hash.hash_append(hc, self._env:id()) licences = self:get_licences() for licencename in licences:iter_sorted() do lid, re = licence.licences[licencename]:licenceid(info) if not lid then return false, re end - hash.hash_line(hc, lid) + hash.hash_append(hc, lid) end -- cvs specific if sourceset == "tag" and self._tag ~= "^" then -- we rely on tags being unique with cvs - hash.hash_line(hc, self._tag) + hash.hash_append(hc, self._tag) else -- the old function took a hash of the CVS/Entries file, but -- forgot the subdirecties' CVS/Entries files. We might @@ -250,9 +250,9 @@ function cvs.cvs_source:sourceid(sourceset) return false, err.new("cannot calculate sourceid for source set %s", sourceset) end - hash.hash_line(hc, self._server) - hash.hash_line(hc, self._cvsroot) - hash.hash_line(hc, self._module) + hash.hash_append(hc, self._server) + hash.hash_append(hc, self._cvsroot) + hash.hash_append(hc, self._module) self._sourceids[sourceset] = hash.hash_finish(hc)