From: Tobias Ulmer <tu@emlix.com>
Date: Fri, 6 Dec 2013 14:22:17 +0000 (+0100)
Subject: cache: transport.fetch_file does not take a flags argument
X-Git-Tag: e2factory-2.3.15rc1~293
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=6ec931d386004044f8273bec51dc9106cb0ff4d0;p=e2factory.git

cache: transport.fetch_file does not take a flags argument

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

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