diff options
Diffstat (limited to 'apt-panopticommon.lua')
-rw-r--r-- | apt-panopticommon.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua index 7664297..ffc3af4 100644 --- a/apt-panopticommon.lua +++ b/apt-panopticommon.lua | |||
@@ -671,6 +671,7 @@ APT.collateAll = function(hosts, l, host, func) | |||
671 | results = loadfile(f)() | 671 | results = loadfile(f)() |
672 | results = APT.padResults(results) | 672 | results = APT.padResults(results) |
673 | if nil ~= func then func(results) end | 673 | if nil ~= func then func(results) end |
674 | results = APT.collate(l, host, 'R', results) | ||
674 | local v = hosts[host] | 675 | local v = hosts[host] |
675 | if nil ~= v then | 676 | if nil ~= v then |
676 | local IPs = results.IPs | 677 | local IPs = results.IPs |
@@ -679,16 +680,18 @@ APT.collateAll = function(hosts, l, host, func) | |||
679 | if "table" == type(u) then | 680 | if "table" == type(u) then |
680 | for h, t in pairs(u) do | 681 | for h, t in pairs(u) do |
681 | results = APT.collate(l, host, h, results) | 682 | results = APT.collate(l, host, h, results) |
683 | results = APT.collate(l, host, h .. '_R', results) | ||
682 | if nil ~= func then func(results, h) end | 684 | if nil ~= func then func(results, h) end |
683 | end | 685 | end |
684 | else | 686 | else |
685 | results = APT.collate(l, host, i, results) | 687 | results = APT.collate(l, host, i .. '_R', results) |
686 | if nil ~= func then func(results, i) end | 688 | if nil ~= func then func(results, i) end |
687 | end | 689 | end |
688 | end | 690 | end |
689 | end | 691 | end |
690 | end | 692 | end |
691 | end | 693 | end |
694 | results = APT.padResults(results) | ||
692 | return results | 695 | return results |
693 | end | 696 | end |
694 | 697 | ||