diff options
| author | Peter Melnichenko <mpeterval@gmail.com> | 2016-11-14 23:02:10 +0300 |
|---|---|---|
| committer | Peter Melnichenko <mpeterval@gmail.com> | 2016-11-14 23:02:10 +0300 |
| commit | 922d6aaf9f99fb32c8b20c34a859548f73ff3391 (patch) | |
| tree | 35693b818f1a91c8978a83c0c2c410cea19a697b /src | |
| parent | 5b8651369fae1d302442e7c60d07b109e1bb2339 (diff) | |
| download | luarocks-922d6aaf9f99fb32c8b20c34a859548f73ff3391.tar.gz luarocks-922d6aaf9f99fb32c8b20c34a859548f73ff3391.tar.bz2 luarocks-922d6aaf9f99fb32c8b20c34a859548f73ff3391.zip | |
Fix duplicated error message on missing rock manifest
Fix incorrect merge on top of @66a4d40 resulting
in duplicated "rock_manifest file not found" error message
when updating manifest.
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/manif/writer.lua | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/luarocks/manif/writer.lua b/src/luarocks/manif/writer.lua index 0a4a1a96..2d17d328 100644 --- a/src/luarocks/manif/writer.lua +++ b/src/luarocks/manif/writer.lua | |||
| @@ -207,10 +207,8 @@ local function store_results(results, manifest) | |||
| 207 | local entrytable = {} | 207 | local entrytable = {} |
| 208 | entrytable.arch = entry.arch | 208 | entrytable.arch = entry.arch |
| 209 | if entry.arch == "installed" then | 209 | if entry.arch == "installed" then |
| 210 | local rock_manifest = manif.load_rock_manifest(name, version) | 210 | local rock_manifest, err = manif.load_rock_manifest(name, version) |
| 211 | if not rock_manifest then | 211 | if not rock_manifest then return nil, err end |
| 212 | return nil, "rock_manifest file not found for "..name.." "..version.." - not a LuaRocks 2 tree?" | ||
| 213 | end | ||
| 214 | 212 | ||
| 215 | entrytable.modules = repos.package_modules(name, version) | 213 | entrytable.modules = repos.package_modules(name, version) |
| 216 | store_package_items(manifest.modules, name, version, entrytable.modules) | 214 | store_package_items(manifest.modules, name, version, entrytable.modules) |