aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2013-12-20 18:13:40 -0200
committerHisham Muhammad <hisham@gobolinux.org>2013-12-20 18:13:40 -0200
commitf1693432ac62bac910215e962f4a3417111ca840 (patch)
tree7c5706dc7716c81d7a2216ac4201a3127d95df58
parente13d4e0e377a5fce26f335c4e7e66db1377a519f (diff)
downloadluarocks-f1693432ac62bac910215e962f4a3417111ca840.tar.gz
luarocks-f1693432ac62bac910215e962f4a3417111ca840.tar.bz2
luarocks-f1693432ac62bac910215e962f4a3417111ca840.zip
Let's not use "built-in" terminology in this case: avoid confusion with the "builtin" build mode.
-rw-r--r--src/luarocks/search.lua6
1 files 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)
210 end 210 end
211 end 211 end
212 -- search through rocks in cfg.rocks_provided 212 -- search through rocks in cfg.rocks_provided
213 local provided_repo = "built-in or listed in cfg.rocks_provided" 213 local provided_repo = "provided by VM or rocks_provided"
214 local name, versions 214 local name, versions
215 for name, versions in pairs(cfg.rocks_provided) do 215 for name, versions in pairs(cfg.rocks_provided) do
216 store_if_match(results, provided_repo, name, versions, "installed", query) 216 store_if_match(results, provided_repo, name, versions, "installed", query)
@@ -281,9 +281,9 @@ function find_suitable_rock(query)
281 elseif not next(results, first) then 281 elseif not next(results, first) then
282 if cfg.rocks_provided[query.name] ~= nil then 282 if cfg.rocks_provided[query.name] ~= nil then
283 -- do not install versions that listed in cfg.rocks_provided 283 -- do not install versions that listed in cfg.rocks_provided
284 return nil, "The found rock "..query.name.. 284 return nil, "Rock "..query.name..
285 " "..cfg.rocks_provided[query.name].. 285 " "..cfg.rocks_provided[query.name]..
286 " is either built-in or listed in cfg.rocks_provided!" 286 " was found but it is provided by VM or 'rocks_provided' in the config file."
287 end 287 end
288 return pick_latest_version(query.name, results[first]) 288 return pick_latest_version(query.name, results[first])
289 else 289 else