source config: checksum_file is no longer used and marked deprecated

Signed-off-by: Gordon Hecker <gh@emlix.com>

diff --git a/local/e2tool.lua b/local/e2tool.lua
index d10df267878aec23ddf1165f7bf04e1d3ad6c5c0..b8d9a795f86d7e31f558dededc973f34186fe1b9 100644 (file)
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -449,9 +449,6 @@ The newest configuration syntax supported by the tools is %s.
   -- build number table
   info.build_numbers  = {}
 
-  -- checksum file suffixes, ordered by priority
-  info.default_checksum_file_suffix = ".sha1"
-
   info.sources = {}
 
   -- read project environment file

diff --git a/local/files.lua b/local/files.lua
index 67fd97da6ddd95375382101cc8994e04e0b29714..dd25f3516360c5ee36023a811455c497a9d5ccf9 100644 (file)
--- a/local/files.lua
+++ b/local/files.lua
@@ -90,13 +90,11 @@ function files.validate_source(info, sourcename)
         e:append("source has file entry without `unpack, copy or patch' " ..
                        "attribute")
       end
-      if f.location and (not f.checksum_file) then
-        f.checksum_file = string.format("%s%s", f.location, 
-                                       info.default_checksum_file_suffix)
-       e2lib.warnf("WDEFAULT", "in source %s:", sourcename)
-       e2lib.warnf("WDEFAULT", " file: %s:%s", f.server, f.location)
-       e2lib.warnf("WDEFAULT", " checksum_file defaulting to %s",
-                                                       f.checksum_file)
+      if f.checksum_file then
+       e2lib.warnf("WDEPRECATED", "in source %s:", sourcename)
+       e2lib.warnf("WDEPRECATED",
+               " checksum_file attribute is deprecated and no longer used")
+       f.checksum_file = nil
       end
     end
   end
@@ -128,13 +126,6 @@ function files.cache_source(info, sourcename)
       if not rc then
         return false, e
       end
-      local rc, e = cache.cache_file(info.cache, f.server, f.checksum_file, 
-                                                                       flags)
-      if not rc then
-       e2lib.log(3,
-               estring(e, string.format("%s:%s", f.server, f.checksum_file)))
-        -- this is not fatal
-      end
     else
       e2lib.log(4, string.format("not caching %s:%s (stored locally)", 
                                                        f.server, f.location))
@@ -345,7 +336,6 @@ function files.sourceid(info, sourcename, sourceset)
                        return false, e:cat(re)
                end
                hash.hash_line(hc, fileid)
-               hash.hash_line(hc, f.checksum_file)
                hash.hash_line(hc, f.location)
                hash.hash_line(hc, f.server)
                hash.hash_line(hc, tostring(f.unpack))