Skip to content

Check for manifest in versioned rocks trees first #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hishamhm merged 1 commit into from
Jun 12, 2015
Merged

Check for manifest in versioned rocks trees first #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions datafile/openers/luarocks.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ function luarocks.opener(file, mode, context)
local prefix, luaver, modpath = source:match("@(.*)/share/lua/([^/]*)/(.*)")
if prefix and luaver and modpath then
local modname = path.path_to_module(modpath):gsub("\\","."):gsub("/",".")
local rocks_dir = prefix.."/lib/luarocks/rocks"
local rocks_dir = prefix.."/lib/luarocks/rocks-"..luaver
local manifest, err = manif_core.load_local_manifest(rocks_dir)
if not manifest then
rocks_dir = prefix.."/lib/luarocks/rocks-"..luaver
if not manifest then -- look for generic rocks_dir
rocks_dir = prefix.."/lib/luarocks/rocks"
manifest, err = manif_core.load_local_manifest(rocks_dir)
end
if not manifest then
Expand Down