diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2013-11-12 13:33:14 -0800 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2013-11-12 13:33:14 -0800 |
| commit | 1078610241d5fe84733bc1094653b482dc64a8ac (patch) | |
| tree | 9adc2c01538c337c6ccdb3014cfdede60ebb8e84 | |
| parent | 0643c2c5b117a50cda26d6305a641e138ddf2399 (diff) | |
| parent | 14d06b07c9b2255a52f3ba2afa65bb9ce2fa7654 (diff) | |
| download | luarocks-1078610241d5fe84733bc1094653b482dc64a8ac.tar.gz luarocks-1078610241d5fe84733bc1094653b482dc64a8ac.tar.bz2 luarocks-1078610241d5fe84733bc1094653b482dc64a8ac.zip | |
Merge pull request #179 from akfidjeland/bugfix-deps-mode-order
map_trees deals with both string and table trees
| -rw-r--r-- | src/luarocks/path.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua index f5a7e9ed..f8ae15c0 100644 --- a/src/luarocks/path.lua +++ b/src/luarocks/path.lua | |||
| @@ -336,7 +336,7 @@ function map_trees(deps_mode, fn, ...) | |||
| 336 | use = true | 336 | use = true |
| 337 | end | 337 | end |
| 338 | for _, tree in ipairs(cfg.rocks_trees) do | 338 | for _, tree in ipairs(cfg.rocks_trees) do |
| 339 | if dir.normalize(tree) == dir.normalize(cfg.root_dir) then | 339 | if dir.normalize(rocks_tree_to_string(tree)) == dir.normalize(rocks_tree_to_string(cfg.root_dir)) then |
| 340 | use = true | 340 | use = true |
| 341 | end | 341 | end |
| 342 | if use then | 342 | if use then |