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.

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)
             local entrytable = {}
             entrytable.arch = entry.arch
             if entry.arch == "installed" then
-               local rock_manifest = manif.load_rock_manifest(name, version)
-               if not rock_manifest then
-                  return nil, "rock_manifest file not found for "..name.." "..version.." - not a LuaRocks 2 tree?"
-               end
+               local rock_manifest, err = manif.load_rock_manifest(name, version)
+               if not rock_manifest then return nil, err end
 
                entrytable.modules = repos.package_modules(name, version)
                store_package_items(manifest.modules, name, version, entrytable.modules)