From fb8a377a8735382921f72cd97bb98a0aef38de72 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Fri, 28 Oct 2016 18:03:30 +0300 Subject: manif.update_manifest: do not update manifest if rebuilt --- src/luarocks/manif.lua | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua index 6b42912d..9213f362 100644 --- a/src/luarocks/manif.lua +++ b/src/luarocks/manif.lua @@ -422,14 +422,10 @@ function manif.update_manifest(name, version, repo, deps_mode) local manifest, err = manif_core.load_local_manifest(rocks_dir) if not manifest then util.printerr("No existing manifest. Attempting to rebuild...") - local ok, err = manif.make_manifest(rocks_dir, deps_mode) - if not ok then - return nil, err - end - manifest, err = manif.load_manifest(rocks_dir) - if not manifest then - return nil, err - end + -- Manifest built by `manif.make_manifest` should already + -- include information about given name and version, + -- no need to update it. + return manif.make_manifest(rocks_dir, deps_mode) end local results = {[name] = {[version] = {{arch = "installed", repo = rocks_dir}}}} -- cgit v1.2.3-55-g6feb