From 6ec931d386004044f8273bec51dc9106cb0ff4d0 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Fri, 6 Dec 2013 15:22:17 +0100 Subject: [PATCH] cache: transport.fetch_file does not take a flags argument Signed-off-by: Tobias Ulmer --- generic/cache.lua | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/generic/cache.lua b/generic/cache.lua index dc5690f..fe943c8 100644 --- a/generic/cache.lua +++ b/generic/cache.lua @@ -315,16 +315,14 @@ function cache.fetch_file(c, server, location, destdir, destname, flags) if not rc then return false, e:cat(re) end - rc, re = transport.fetch_file(ce.cache_url, location, - destdir, destname, flags) + rc, re = transport.fetch_file(ce.cache_url, location, destdir, destname) if not rc then return false, e:cat(re) end else -- cache is disabled: -- fetch from source to destination - rc, re = transport.fetch_file(ce.remote_url, location, - destdir, destname, flags) + rc, re = transport.fetch_file(ce.remote_url, location, destdir, destname) if not rc then return false, e:cat(re) end @@ -441,8 +439,7 @@ function cache.cache_file(c, server, location, flags) -- file is in the cache and no refresh requested return true, nil end - local destdir = string.format("/%s/%s", ceurl.path, - e2lib.dirname(location)) + local destdir = e2lib.join("/", ceurl.path, e2lib.dirname(location)) -- fetch the file to the cache rc, re = transport.fetch_file(ce.remote_url, location, destdir, nil) if not rc then -- 2.39.5