Merge branch 'master' into multitree

7 files changed, 18 insertions, 39 deletions

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index acf35793..136ea6be 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -26,7 +26,6 @@ _M.site_config = site_config
 
 lua_version = _VERSION:sub(5)
 program_version = "2.0.11"
-user_agent = "LuaRocks/"..program_version
 
 local persist = require("luarocks.persist")
 
@@ -439,6 +438,8 @@ function which_config()
    return sys_config_file, sys_config_ok, home_config_file, home_config_ok
 end
 
+user_agent = "LuaRocks/"..program_version.." "..arch
+
 --- Check if platform was detected
 -- @param query string: The platform name to check.
 -- @return boolean: true if LuaRocks is currently running on queried platform.
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/fs/lua.lua b/src/luarocks/fs/lua.lua
index cd199fbb..d6795773 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -496,7 +496,15 @@ local function http_request(url, http, loop_control)
       proxy = "http://" .. proxy
    end
    
-   local res, status, headers, err = http.request { url = url, proxy = proxy, redirect = false, sink = ltn12.sink.table(result) }
+   local res, status, headers, err = http.request {
+      url = url,
+      proxy = proxy,
+      redirect = false,
+      sink = ltn12.sink.table(result),
+      headers = {
+         ["user-agent"] = cfg.user_agent.." via LuaSocket"
+      },
+   }
    if not res then
       return nil, status
    elseif status == 301 or status == 302 then
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 7e29fc0a..3b853be7 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -237,7 +237,7 @@ function download(url, filename)
    assert(type(filename) == "string" or not filename)
 
    if cfg.downloader == "wget" then
-      local wget_cmd = vars.WGET.." --no-check-certificate --no-cache --user-agent="..cfg.user_agent.." --quiet --continue "
+      local wget_cmd = vars.WGET.." --no-check-certificate --no-cache --user-agent='"..cfg.user_agent.." via wget' --quiet --continue "
       if filename then
          return fs.execute(wget_cmd.." --output-document ", filename, url)
       else
@@ -245,7 +245,7 @@ function download(url, filename)
       end
    elseif cfg.downloader == "curl" then
       filename = filename or dir.base_name(url)
-      return fs.execute_string(vars.CURL.." -L --user-agent "..cfg.user_agent.." "..fs.Q(url).." 2> /dev/null 1> "..fs.Q(filename))
+      return fs.execute_string(vars.CURL.." -L --user-agent '"..cfg.user_agent.." via curl' "..fs.Q(url).." 2> /dev/null 1> "..fs.Q(filename))
    end
 end
 
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 48eca64b..3e7ebd32 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -246,7 +246,7 @@ function download(url, filename)
    assert(type(filename) == "string" or not filename)
 
    if cfg.downloader == "wget" then
-      local wget_cmd = vars.WGET.." --no-check-certificate --no-cache --user-agent="..cfg.user_agent.." --quiet --continue "
+      local wget_cmd = vars.WGET.." --no-check-certificate --no-cache --user-agent=\""..cfg.user_agent.." via wget\" --quiet --continue "
       if filename then
          return fs.execute(wget_cmd.." --output-document ", filename, url)
       else
@@ -254,7 +254,7 @@ function download(url, filename)
       end
    elseif cfg.downloader == "curl" then
       filename = filename or dir.base_name(url)
-      return fs.execute_string(vars.CURL.." -L --user-agent "..cfg.user_agent.." "..fs.Q(url).." 2> NUL 1> "..fs.Q(filename))
+      return fs.execute_string(vars.CURL.." -L --user-agent \""..cfg.user_agent.." via curl\" "..fs.Q(url).." 2> NUL 1> "..fs.Q(filename))
    end
 end
 
diff --git a/src/luarocks/repos.lua b/src/luarocks/repos.lua
index 3a337e7c..dc1b63c8 100644
--- a/src/luarocks/repos.lua
+++ b/src/luarocks/repos.lua
@@ -53,22 +53,6 @@ local function recurse_rock_manifest_tree(file_tree, action)
    return do_recurse_rock_manifest_tree(file_tree, "", "")
 end
 
-local function store_package_data(result, name, sub, prefix)
-   assert(type(result) == "table")
-   assert(type(name) == "string")
-   assert(type(sub) == "table" or type(sub) == "string")
-   assert(type(prefix) == "string")
-
-   if type(sub) == "table" then
-      for sname, ssub in pairs(sub) do
-         store_package_data(result, sname, ssub, prefix..name.."/")
-      end
-   elseif type(sub) == "string" then
-      local pathname = prefix..name
-      result[path.path_to_module(pathname)] = pathname
-   end
-end
-
 local function store_package_data(result, name, file_tree)
    if not file_tree then return end
    return recurse_rock_manifest_tree(file_tree, 
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index ec0fa69c..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."
@@ -349,13 +345,6 @@ function act_on_src_or_rockspec(action, name, version, ...)
    local results, err = find_suitable_rock(query)
    if type(results) == "string" then
       return action(results, ...)
-   elseif type(results) == "table" and next(results) then
-      util.printout("Multiple search results were returned.")
-      util.printout()
-      util.printout("Search results:")
-      util.printout("---------------")
-      print_results(results)
-      return nil, "Please narrow your query."
    else
       return nil, "Could not find a result named "..name..(version and " "..version or "").."."
    end
@@ -380,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("===============")