From 91ecea77c6e01e5bf3e0a15ea2146c0a0dbcd573 Mon Sep 17 00:00:00 2001 From: Paul Ouellette Date: Mon, 12 Aug 2019 15:31:14 -0400 Subject: Fix wrong versions in search failure error message --- src/luarocks/manif.lua | 6 ++++-- src/luarocks/search.lua | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua index 45130696..8784f327 100644 --- a/src/luarocks/manif.lua +++ b/src/luarocks/manif.lua @@ -91,9 +91,11 @@ end -- through this function. -- @param repo_url string: URL or pathname for the repository. -- @param lua_version string: Lua version in "5.x" format, defaults to installed version. +-- @param versioned_only boolean: If true, do not fall back to the main manifest +-- if a versioned manifest was not found. -- @return table or (nil, string, [string]): A table representing the manifest, -- or nil followed by an error message and an optional error code. -function manif.load_manifest(repo_url, lua_version) +function manif.load_manifest(repo_url, lua_version, versioned_only) assert(type(repo_url) == "string") assert(type(lua_version) == "string" or not lua_version) lua_version = lua_version or cfg.lua_version @@ -107,7 +109,7 @@ function manif.load_manifest(repo_url, lua_version) local filenames = { "manifest-"..lua_version..".zip", "manifest-"..lua_version, - "manifest", + not versioned_only and "manifest" or nil, } local protocol, repodir = dir.split_url(repo_url) diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua index e5ee9b47..46c47309 100644 --- a/src/luarocks/search.lua +++ b/src/luarocks/search.lua @@ -108,7 +108,7 @@ local function manifest_search(result_tree, repo, query, lua_version, is_local) repo = repo .. "/manifests/" .. query.namespace end - local manifest, err, errcode = manif.load_manifest(repo, lua_version) + local manifest, err, errcode = manif.load_manifest(repo, lua_version, true) if not manifest then return nil, err, errcode end -- cgit v1.2.3-55-g6feb