From 608467a030aa14919e06b2ff8cae529d0db273bd Mon Sep 17 00:00:00 2001
From: mpeterv <mpeterval@gmail.com>
Date: Sun, 20 Mar 2016 13:05:10 +0300
Subject: Show search error in functions using find_suitable_rock

---
 src/luarocks/deps.lua     | 2 +-
 src/luarocks/download.lua | 7 +++++--
 src/luarocks/search.lua   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 278b6356..812e6d18 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -486,7 +486,7 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
          if not match_dep(dep, nil, deps_mode) then
             local url, err = search.find_suitable_rock(dep)
             if not url then
-               return nil, "Could not satisfy dependency: "..deps.show_dep(dep)
+               return nil, "Could not satisfy dependency "..deps.show_dep(dep)..": "..err
             end
             local ok, err, errcode = install.run(url, deps.deps_mode_to_flag(deps_mode))
             if not ok then
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index f08ba7fe..090f49aa 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -39,6 +39,7 @@ end
 function download.download(arch, name, version, all)
    local query = search.make_query(name, version)
    if arch then query.arch = arch end
+   local search_err
 
    if all then
       if name == "" then query.exact_name = false end
@@ -67,12 +68,14 @@ function download.download(arch, name, version, all)
          return all_ok, any_err
       end
    else
-      local url = search.find_suitable_rock(query)
+      local url
+      url, search_err = search.find_suitable_rock(query)
       if url then
          return get_file(url)
       end
    end
-   return nil, "Could not find a result named "..name..(version and " "..version or "").."."
+   return nil, "Could not find a result named "..name..(version and " "..version or "")..
+      (search_err and ": "..search_err or ".")
 end
 
 --- Driver function for the "download" command.
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index a06fdd45..0276dfae 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -369,7 +369,7 @@ function search.act_on_src_or_rockspec(action, name, version, ...)
    query.arch = "src|rockspec"
    local url, err = search.find_suitable_rock(query)
    if not url then
-      return nil, "Could not find a result named "..name..(version and " "..version or "").."."
+      return nil, "Could not find a result named "..name..(version and " "..version or "")..": "..err
    end
    return action(url, ...)
 end
-- 
cgit v1.2.3-55-g6feb