ap: bugfix in builddirs

This commit is contained in:
Natanael Copa 2010-12-13 14:51:29 +00:00
parent ce0e95607d
commit 1a1199b9ec

13
ap.in
View File

@ -66,9 +66,8 @@ subcmd.builddirs = {
desc = "Print the build dirs for given packages in build order", desc = "Print the build dirs for given packages in build order",
usage = "PKG...", usage = "PKG...",
run = function(opts) run = function(opts)
local i, _ local i, p, _
local visited = {} local visited = {}
local dir_visited = {}
local apkdb, rev = aports.init_apkdb(repodirs) local apkdb, rev = aports.init_apkdb(repodirs)
local to_print = {} local to_print = {}
function recursdir(pn) function recursdir(pn)
@ -78,8 +77,6 @@ subcmd.builddirs = {
visited[pn] = true visited[pn] = true
local i, p local i, p
for i,p in pairs(apkdb[pn]) do for i,p in pairs(apkdb[pn]) do
if not dir_visited[p.dir] then
dir_visited[p.dir] = true
local _, d local _, d
for _, d in pairs(p.depends) do for _, d in pairs(p.depends) do
recursdir(d) recursdir(d)
@ -87,14 +84,16 @@ subcmd.builddirs = {
for _, d in pairs(p.makedepends) do for _, d in pairs(p.makedepends) do
recursdir(d) recursdir(d)
end end
if to_print[pn] then if to_print[p.dir] then
print(p.dir) print(p.dir)
end to_print[p.dir] = nil
end end
end end
end end
for i = 2, #opts do for i = 2, #opts do
to_print[opts[i]] = true for _,p in pairs(apkdb[opts[i]]) do
to_print[p.dir] = true
end
end end
for i = 2, #opts do for i = 2, #opts do
recursdir(opts[i]) recursdir(opts[i])