diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-04-07 08:47:52 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-04-07 08:48:44 +0200 |
| commit | 4de3a72e08487d44b2d4a57e7334d97cdebb8770 (patch) | |
| tree | afcd6fc01633fb6d874e1c434560013860846a79 /aports/db.lua | |
| parent | 1c45eb6b334e404ad0d38fad9c87918dc3c1db91 (diff) | |
| download | lua-aports-4de3a72e08487d44b2d4a57e7334d97cdebb8770.tar.bz2 lua-aports-4de3a72e08487d44b2d4a57e7334d97cdebb8770.tar.xz | |
buildrepo: fix bug when repodest is set with buildrepo -d
we need to use the specified repodest when checking if package is built
or not
Diffstat (limited to 'aports/db.lua')
| -rw-r--r-- | aports/db.lua | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/aports/db.lua b/aports/db.lua index 45e394e..09afaeb 100644 --- a/aports/db.lua +++ b/aports/db.lua @@ -116,7 +116,7 @@ local function apkbuilds_open(aportsdir, repos) return obj end -local function init_apkdb(aportsdir, repos) +local function init_apkdb(aportsdir, repos, repodest) local pkgdb = {} local revdeps = {} local apkbuilds = apkbuilds_open(aportsdir, repos) @@ -125,7 +125,7 @@ local function init_apkdb(aportsdir, repos) if pkgdb[a.pkgname] == nil then pkgdb[a.pkgname] = {} end - pkg.init(a) + pkg.init(a, repodest) table.insert(pkgdb[a.pkgname], a) -- add subpackages to package db local k,v @@ -296,11 +296,15 @@ function Aports:known_deps_exists(pkg) return true end -function M.new(aportsdir, ...) +function M.new(aportsdir, repos, repodest) local h = Aports h.aportsdir = aportsdir - h.repos = {...} - h.apks, h.revdeps = init_apkdb(aportsdir, h.repos) + if type(repos) == "table" then + h.repos = repos + else + h.repos = { repos } + end + h.apks, h.revdeps = init_apkdb(aportsdir, h.repos, repodest) if h.apks == nil then return nil, h.revdeps end |