diff options
| author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-11-12 16:49:18 +0100 |
|---|---|---|
| committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-11-12 16:49:18 +0100 |
| commit | 7e520a520283ee27c384660aa31259e609cb5e6e (patch) | |
| tree | efbb1433d78ae0957ddeb5f6299dea34ebc3e551 /src | |
| parent | a726e45ec81e2cc8512f9e4c5b1459a86ab53098 (diff) | |
| parent | bdcde8743014964b3fbe13154bedc9ac6bceae76 (diff) | |
| download | luarocks-7e520a520283ee27c384660aa31259e609cb5e6e.tar.gz luarocks-7e520a520283ee27c384660aa31259e609cb5e6e.tar.bz2 luarocks-7e520a520283ee27c384660aa31259e609cb5e6e.zip | |
Merge branch 'master' of github.com:Tieske/luarocks into win_install_checkpath
Conflicts:
install.bat
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/build/cmake.lua | 2 | ||||
| -rw-r--r-- | src/luarocks/loader.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua index f1737876..0df3a921 100644 --- a/src/luarocks/build/cmake.lua +++ b/src/luarocks/build/cmake.lua | |||
| @@ -22,7 +22,7 @@ function run(rockspec) | |||
| 22 | 22 | ||
| 23 | util.variable_substitutions(variables, rockspec.variables) | 23 | util.variable_substitutions(variables, rockspec.variables) |
| 24 | 24 | ||
| 25 | if not fs.execute_quiet(rockspec.variables.CMAKE, "--help")) then | 25 | if not fs.execute_quiet(rockspec.variables.CMAKE, "--help") then |
| 26 | return nil, "'"..rockspec.variables.CMAKE.."' program not found. Is cmake installed? You may want to edit variables.CMAKE" | 26 | return nil, "'"..rockspec.variables.CMAKE.."' program not found. Is cmake installed? You may want to edit variables.CMAKE" |
| 27 | end | 27 | end |
| 28 | 28 | ||
diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua index a116766c..aa3b2781 100644 --- a/src/luarocks/loader.lua +++ b/src/luarocks/loader.lua | |||
| @@ -108,7 +108,7 @@ end | |||
| 108 | -- @return table or (nil, string): The module table as returned by some other loader, | 108 | -- @return table or (nil, string): The module table as returned by some other loader, |
| 109 | -- or nil followed by an error message if no other loader managed to load the module. | 109 | -- or nil followed by an error message if no other loader managed to load the module. |
| 110 | local function call_other_loaders(module, name, version, module_name) | 110 | local function call_other_loaders(module, name, version, module_name) |
| 111 | for i, loader in pairs(package.loaders) do | 111 | for i, loader in ipairs(package.loaders) do |
| 112 | if loader ~= luarocks_loader then | 112 | if loader ~= luarocks_loader then |
| 113 | local results = { loader(module_name) } | 113 | local results = { loader(module_name) } |
| 114 | if type(results[1]) == "function" then | 114 | if type(results[1]) == "function" then |