diff options
| author | mpeterv <mpeterval@gmail.com> | 2015-12-05 16:45:28 +0300 |
|---|---|---|
| committer | mpeterv <mpeterval@gmail.com> | 2015-12-05 18:39:36 +0300 |
| commit | f59f8719eb6c462ad332190c3750f5f209d028b8 (patch) | |
| tree | 8d03ba6d145bc86868a2077dd3cc3541fb611d5a | |
| parent | 5ff2408d35eee424359ba5bdd6b5f792f8a0b046 (diff) | |
| download | luarocks-f59f8719eb6c462ad332190c3750f5f209d028b8.tar.gz luarocks-f59f8719eb6c462ad332190c3750f5f209d028b8.tar.bz2 luarocks-f59f8719eb6c462ad332190c3750f5f209d028b8.zip | |
Process external deps in sorted order
Ensure consistent output for Lua 5.3 where key order of pairs() can
change between two runs.
| -rw-r--r-- | src/luarocks/deps.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index 38541b68..eb01075c 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua | |||
| @@ -545,7 +545,7 @@ function deps.check_external_deps(rockspec, mode) | |||
| 545 | subdirs = cfg.runtime_external_deps_subdirs | 545 | subdirs = cfg.runtime_external_deps_subdirs |
| 546 | end | 546 | end |
| 547 | if rockspec.external_dependencies then | 547 | if rockspec.external_dependencies then |
| 548 | for name, ext_files in pairs(rockspec.external_dependencies) do | 548 | for name, ext_files in util.sortedpairs(rockspec.external_dependencies) do |
| 549 | local ok = true | 549 | local ok = true |
| 550 | local failed_files = {program = {}, header = {}, library = {}} | 550 | local failed_files = {program = {}, header = {}, library = {}} |
| 551 | local failed_dirname | 551 | local failed_dirname |
| @@ -578,7 +578,7 @@ function deps.check_external_deps(rockspec, mode) | |||
| 578 | end | 578 | end |
| 579 | prefix = prefix.prefix | 579 | prefix = prefix.prefix |
| 580 | end | 580 | end |
| 581 | for dirname, dirdata in pairs(dirs) do | 581 | for dirname, dirdata in util.sortedpairs(dirs) do |
| 582 | local paths | 582 | local paths |
| 583 | local path_var_value = vars[name.."_"..dirname] | 583 | local path_var_value = vars[name.."_"..dirname] |
| 584 | if path_var_value then | 584 | if path_var_value then |