diff options
| author | Peter Melnichenko <mpeterval@gmail.com> | 2016-10-28 17:57:42 +0300 |
|---|---|---|
| committer | Peter Melnichenko <mpeterval@gmail.com> | 2016-10-28 22:38:19 +0300 |
| commit | b09ffc7d1c207a5cc4dda7b6ba1f52ede222327b (patch) | |
| tree | b76390620a03f1d4986ab028c7dbcfb822400404 /src | |
| parent | 6a6d4e1c2f97b11caf826641b7dc1640effe283e (diff) | |
| download | luarocks-b09ffc7d1c207a5cc4dda7b6ba1f52ede222327b.tar.gz luarocks-b09ffc7d1c207a5cc4dda7b6ba1f52ede222327b.tar.bz2 luarocks-b09ffc7d1c207a5cc4dda7b6ba1f52ede222327b.zip | |
Rename a variable in manif.update_manifest
`repo` sometimes means root dir and sometimes means rock dir.
At least do not reuse the same variable for both.
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/manif.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua index 4122364a..d697a93c 100644 --- a/src/luarocks/manif.lua +++ b/src/luarocks/manif.lua | |||
| @@ -414,31 +414,31 @@ end | |||
| 414 | function manif.update_manifest(name, version, repo, deps_mode) | 414 | function manif.update_manifest(name, version, repo, deps_mode) |
| 415 | assert(type(name) == "string") | 415 | assert(type(name) == "string") |
| 416 | assert(type(version) == "string") | 416 | assert(type(version) == "string") |
| 417 | repo = path.rocks_dir(repo or cfg.root_dir) | 417 | local rocks_dir = path.rocks_dir(repo or cfg.root_dir) |
| 418 | assert(type(deps_mode) == "string") | 418 | assert(type(deps_mode) == "string") |
| 419 | 419 | ||
| 420 | if deps_mode == "none" then deps_mode = cfg.deps_mode end | 420 | if deps_mode == "none" then deps_mode = cfg.deps_mode end |
| 421 | 421 | ||
| 422 | local manifest, err = manif.load_manifest(repo) | 422 | local manifest, err = manif.load_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(repo, deps_mode) | 425 | local ok, err = manif.make_manifest(rocks_dir, deps_mode) |
| 426 | if not ok then | 426 | if not ok then |
| 427 | return nil, err | 427 | return nil, err |
| 428 | end | 428 | end |
| 429 | manifest, err = manif.load_manifest(repo) | 429 | manifest, err = manif.load_manifest(rocks_dir) |
| 430 | if not manifest then | 430 | if not manifest then |
| 431 | return nil, err | 431 | return nil, err |
| 432 | end | 432 | end |
| 433 | end | 433 | end |
| 434 | 434 | ||
| 435 | local results = {[name] = {[version] = {{arch = "installed", repo = repo}}}} | 435 | local results = {[name] = {[version] = {{arch = "installed", repo = rocks_dir}}}} |
| 436 | 436 | ||
| 437 | local ok, err = store_results(results, manifest) | 437 | local ok, err = store_results(results, manifest) |
| 438 | if not ok then return nil, err end | 438 | if not ok then return nil, err end |
| 439 | 439 | ||
| 440 | update_dependencies(manifest, deps_mode) | 440 | update_dependencies(manifest, deps_mode) |
| 441 | return save_table(repo, "manifest", manifest) | 441 | return save_table(rocks_dir, "manifest", manifest) |
| 442 | end | 442 | end |
| 443 | 443 | ||
| 444 | function manif.zip_manifests() | 444 | function manif.zip_manifests() |
