ap: bugfix in builddirs
This commit is contained in:
parent
ce0e95607d
commit
1a1199b9ec
29
ap.in
29
ap.in
@ -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,23 +77,23 @@ 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
|
local _, d
|
||||||
dir_visited[p.dir] = true
|
for _, d in pairs(p.depends) do
|
||||||
local _, d
|
recursdir(d)
|
||||||
for _, d in pairs(p.depends) do
|
end
|
||||||
recursdir(d)
|
for _, d in pairs(p.makedepends) do
|
||||||
end
|
recursdir(d)
|
||||||
for _, d in pairs(p.makedepends) do
|
end
|
||||||
recursdir(d)
|
if to_print[p.dir] then
|
||||||
end
|
print(p.dir)
|
||||||
if to_print[pn] then
|
to_print[p.dir] = nil
|
||||||
print(p.dir)
|
|
||||||
end
|
|
||||||
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])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user