diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2012-09-11 14:41:46 -0700 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2012-09-11 14:41:46 -0700 |
| commit | b1a36075e3a63167e97c124d2923ae1b10e07c29 (patch) | |
| tree | 9eec2011741633e1177b05b97a62a836b35be7e4 /src | |
| parent | 060882ddc775c2db079f5cd3ff9606052f4bfc73 (diff) | |
| parent | bcd7bb1654ebf0a5190c7ed71f74237a5e486971 (diff) | |
| download | luarocks-b1a36075e3a63167e97c124d2923ae1b10e07c29.tar.gz luarocks-b1a36075e3a63167e97c124d2923ae1b10e07c29.tar.bz2 luarocks-b1a36075e3a63167e97c124d2923ae1b10e07c29.zip | |
Merge pull request #93 from hoelzro/master
Return error message on loader failure
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/loader.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua index a0120c5f..139bcb8b 100644 --- a/src/luarocks/loader.lua +++ b/src/luarocks/loader.lua | |||
| @@ -116,7 +116,7 @@ local function call_other_loaders(module, name, version, module_name) | |||
| 116 | end | 116 | end |
| 117 | end | 117 | end |
| 118 | end | 118 | end |
| 119 | return nil, "Failed loading module "..module.." in LuaRocks rock "..name.." "..version | 119 | return "Failed loading module "..module.." in LuaRocks rock "..name.." "..version |
| 120 | end | 120 | end |
| 121 | 121 | ||
| 122 | --- Search for a module in the rocks trees | 122 | --- Search for a module in the rocks trees |
| @@ -218,7 +218,7 @@ end | |||
| 218 | function luarocks_loader(module) | 218 | function luarocks_loader(module) |
| 219 | local name, version, module_name = pick_module(module) | 219 | local name, version, module_name = pick_module(module) |
| 220 | if not name then | 220 | if not name then |
| 221 | return nil, "No LuaRocks module found for "..module | 221 | return "No LuaRocks module found for "..module |
| 222 | else | 222 | else |
| 223 | add_context(name, version) | 223 | add_context(name, version) |
| 224 | return call_other_loaders(module, name, version, module_name) | 224 | return call_other_loaders(module, name, version, module_name) |