From e51efb721935e959b33c6ec9884d2ecbe418fcb2 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 16 Oct 2012 22:37:39 -0300 Subject: Remove dead code: search_repos always returns a table. --- src/luarocks/download.lua | 2 +- src/luarocks/search.lua | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua index 474e4d39..ae835bf2 100644 --- a/src/luarocks/download.lua +++ b/src/luarocks/download.lua @@ -24,7 +24,7 @@ function download(arch, name, version, all) if arch then query.arch = arch end if all then if name == "" then query.exact_name = false end - results, err = search.search_repos(query) + results = search.search_repos(query) else results, err = search.find_suitable_rock(query) end diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua index 96c6b876..692004ae 100644 --- a/src/luarocks/search.lua +++ b/src/luarocks/search.lua @@ -185,10 +185,9 @@ end --- Search on all configured rocks servers. -- @param query table: A dependency query. --- @return table or (nil, string): A table where keys are package names +-- @return table: A table where keys are package names -- and values are tables matching version strings to an array of -- rocks servers; if no results are found, an empty table is returned. --- In case of errors, nil and and error message are returned. function search_repos(query) assert(type(query) == "table") @@ -269,10 +268,7 @@ end function find_suitable_rock(query) assert(type(query) == "table") - local results, err = search_repos(query) - if not results then - return nil, err - end + local results = search_repos(query) local first = next(results) if not first then return nil, "No results matching query were found." @@ -373,9 +369,6 @@ function run(...) local query = make_query(name:lower(), version) query.exact_name = false local results, err = search_repos(query) - if not results then - return nil, err - end util.printout() util.printout("Search results:") util.printout("===============") -- cgit v1.2.3-55-g6feb