From f1693432ac62bac910215e962f4a3417111ca840 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Fri, 20 Dec 2013 18:13:40 -0200 Subject: Let's not use "built-in" terminology in this case: avoid confusion with the "builtin" build mode. --- src/luarocks/search.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua index 2db55d9e..356e06e8 100644 --- a/src/luarocks/search.lua +++ b/src/luarocks/search.lua @@ -210,7 +210,7 @@ function search_repos(query) end end -- search through rocks in cfg.rocks_provided - local provided_repo = "built-in or listed in cfg.rocks_provided" + local provided_repo = "provided by VM or rocks_provided" local name, versions for name, versions in pairs(cfg.rocks_provided) do store_if_match(results, provided_repo, name, versions, "installed", query) @@ -281,9 +281,9 @@ function find_suitable_rock(query) elseif not next(results, first) then if cfg.rocks_provided[query.name] ~= nil then -- do not install versions that listed in cfg.rocks_provided - return nil, "The found rock "..query.name.. + return nil, "Rock "..query.name.. " "..cfg.rocks_provided[query.name].. - " is either built-in or listed in cfg.rocks_provided!" + " was found but it is provided by VM or 'rocks_provided' in the config file." end return pick_latest_version(query.name, results[first]) else -- cgit v1.2.3-55-g6feb