aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2024-02-19 19:20:52 -0300
committerHisham Muhammad <hisham@gobolinux.org>2024-02-19 23:19:10 -0300
commit444d8301ae07129a531f55994aeec10efaedfa1b (patch)
treee0f924899e07d35f4eedaed0e43f54c41717e220
parent8b653c2824a4a28244fee6bef02994eef8d60d65 (diff)
downloadluarocks-444d8301ae07129a531f55994aeec10efaedfa1b.tar.gz
luarocks-444d8301ae07129a531f55994aeec10efaedfa1b.tar.bz2
luarocks-444d8301ae07129a531f55994aeec10efaedfa1b.zip
fix: don't show "no downloader" error for every mirror
-rw-r--r--src/luarocks/fetch.lua4
-rw-r--r--src/luarocks/fs/lua.lua2
-rw-r--r--src/luarocks/fs/tools.lua8
-rw-r--r--src/luarocks/search.lua3
4 files changed, 10 insertions, 7 deletions
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index 24b3e1e5..f17a9279 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -101,7 +101,7 @@ local function download_with_mirrors(url, filename, cache, servers)
101 end 101 end
102 end 102 end
103 103
104 return nil, err 104 return nil, err, "network"
105end 105end
106 106
107--- Fetch a local or remote file. 107--- Fetch a local or remote file.
@@ -161,7 +161,7 @@ function fetch.fetch_url(url, filename, cache, mirroring)
161 ok, name, from_cache = fs.download(url, filename, cache) 161 ok, name, from_cache = fs.download(url, filename, cache)
162 end 162 end
163 if not ok then 163 if not ok then
164 return nil, "Failed downloading "..url..(name and " - "..name or ""), "network" 164 return nil, "Failed downloading "..url..(name and " - "..name or ""), from_cache
165 end 165 end
166 return name, nil, nil, from_cache 166 return name, nil, nil, from_cache
167 else 167 else
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index ab32eff8..934bba48 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -944,7 +944,7 @@ function fs_lua.download(url, filename, cache)
944 end 944 end
945 return fs.use_downloader(url, filename, cache) 945 return fs.use_downloader(url, filename, cache)
946 elseif not ok then 946 elseif not ok then
947 return nil, err 947 return nil, err, "network"
948 end 948 end
949 return true, filename, from_cache 949 return true, filename, from_cache
950end 950end
diff --git a/src/luarocks/fs/tools.lua b/src/luarocks/fs/tools.lua
index ff29ea39..a7724dc7 100644
--- a/src/luarocks/fs/tools.lua
+++ b/src/luarocks/fs/tools.lua
@@ -142,8 +142,8 @@ end
142-- filename can be given explicitly as this second argument. 142-- filename can be given explicitly as this second argument.
143-- @param cache boolean: compare remote timestamps via HTTP HEAD prior to 143-- @param cache boolean: compare remote timestamps via HTTP HEAD prior to
144-- re-downloading the file. 144-- re-downloading the file.
145-- @return (boolean, string): true and the filename on success, 145-- @return (boolean, string, string): true and the filename on success,
146-- false and the error message on failure. 146-- false and the error message and code on failure.
147function tools.use_downloader(url, filename, cache) 147function tools.use_downloader(url, filename, cache)
148 assert(type(url) == "string") 148 assert(type(url) == "string")
149 assert(type(filename) == "string" or not filename) 149 assert(type(filename) == "string" or not filename)
@@ -152,7 +152,7 @@ function tools.use_downloader(url, filename, cache)
152 152
153 local downloader, err = fs.which_tool("downloader") 153 local downloader, err = fs.which_tool("downloader")
154 if not downloader then 154 if not downloader then
155 return nil, err 155 return nil, err, "downloader"
156 end 156 end
157 157
158 local ok = false 158 local ok = false
@@ -187,7 +187,7 @@ function tools.use_downloader(url, filename, cache)
187 return true, filename 187 return true, filename
188 else 188 else
189 os.remove(filename) 189 os.remove(filename)
190 return false, "failed downloading " .. url 190 return false, "failed downloading " .. url, "network"
191 end 191 end
192end 192end
193 193
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index e76d4591..180f8f45 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -160,6 +160,9 @@ function search.search_repos(query, lua_version)
160 break 160 break
161 else 161 else
162 util.warning("Failed searching manifest: "..err) 162 util.warning("Failed searching manifest: "..err)
163 if errcode == "downloader" then
164 break
165 end
163 end 166 end
164 end 167 end
165 end 168 end