diff options
| author | Peter Melnichenko <mpeterval@gmail.com> | 2016-10-28 18:03:30 +0300 |
|---|---|---|
| committer | Peter Melnichenko <mpeterval@gmail.com> | 2016-10-28 22:38:19 +0300 |
| commit | fb8a377a8735382921f72cd97bb98a0aef38de72 (patch) | |
| tree | 69f85ba338db92747230e981f44cdef46b2ba096 /src | |
| parent | 692c3250cdac66f3dd1379784e57f5e7fa0c53b9 (diff) | |
| download | luarocks-fb8a377a8735382921f72cd97bb98a0aef38de72.tar.gz luarocks-fb8a377a8735382921f72cd97bb98a0aef38de72.tar.bz2 luarocks-fb8a377a8735382921f72cd97bb98a0aef38de72.zip | |
manif.update_manifest: do not update manifest if rebuilt
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/manif.lua | 12 |
1 files changed, 4 insertions, 8 deletions
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) | |||
| 422 | local manifest, err = manif_core.load_local_manifest(rocks_dir) | 422 | local manifest, err = manif_core.load_local_manifest(rocks_dir) |
| 423 | if not manifest then | 423 | if not manifest then |
| 424 | util.printerr("No existing manifest. Attempting to rebuild...") | 424 | util.printerr("No existing manifest. Attempting to rebuild...") |
| 425 | local ok, err = manif.make_manifest(rocks_dir, deps_mode) | 425 | -- Manifest built by `manif.make_manifest` should already |
| 426 | if not ok then | 426 | -- include information about given name and version, |
| 427 | return nil, err | 427 | -- no need to update it. |
| 428 | end | 428 | return manif.make_manifest(rocks_dir, deps_mode) |
| 429 | manifest, err = manif.load_manifest(rocks_dir) | ||
| 430 | if not manifest then | ||
| 431 | return nil, err | ||
| 432 | end | ||
| 433 | end | 429 | end |
| 434 | 430 | ||
| 435 | local results = {[name] = {[version] = {{arch = "installed", repo = rocks_dir}}}} | 431 | local results = {[name] = {[version] = {{arch = "installed", repo = rocks_dir}}}} |