summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2018-10-14 14:21:07 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2019-09-17 11:59:05 +0200
commit9962a1eae793607a60f41ec62690a831f7179d63 (patch)
tree41b3e4c8fce7b0514605cfa4d9a665edcc499d3d
parente3405d25e66ec6970c38ca8e57dd873a25e2ff3b (diff)
downloadlua-aports-9962a1eae793607a60f41ec62690a831f7179d63.tar.bz2
lua-aports-9962a1eae793607a60f41ec62690a831f7179d63.tar.xz
buildrepo: set APORTSDIR before calling abuild
Without this change buildrepo fails if -a is given but the APORTSDIR environment variable is not set when using `abuild rootbld`. With the following error message: /home/nmeum/src/aports/.rootbld-repositories does not exist
-rwxr-xr-xbin/buildrepo.lua10
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/buildrepo.lua b/bin/buildrepo.lua
index 296f56b..0f9011b 100755
--- a/bin/buildrepo.lua
+++ b/bin/buildrepo.lua
@@ -87,7 +87,7 @@ local function logfile_path(logdirbase, repo, aport)
end
-local function build_aport(aport, repodest, logfile, do_rootbld)
+local function build_aport(aport, aportsdir, repodest, logfile, do_rootbld)
local success, errmsg = lfs.chdir(aport.dir)
if not success then
err("%s", errmsg)
@@ -97,9 +97,11 @@ local function build_aport(aport, repodest, logfile, do_rootbld)
if logfile ~= nil then
logredirect = ("> '%s' 2>&1"):format(logfile)
end
- local cmd = ("REPODEST='%s' abuild -r -m %s"):format(repodest, logredirect)
+ local cmd = ("APORTSDIR='%s' REPODEST='%s' abuild -r -m %s"):
+ format(aportsdir, repodest, logredirect)
if do_rootbld ~= nil then
- cmd = ("REPODEST='%s' abuild -m %s rootbld"):format(repodest, logredirect)
+ cmd = ("APORTSDIR='%s' REPODEST='%s' abuild -m %s rootbld"):
+ format(aportsdir, repodest, logredirect)
end
success = os.execute(cmd)
if not success then
@@ -219,7 +221,7 @@ for _, repo in pairs(args) do
elseif not (opts.s and skip_aport(aport)) then
log_progress(progress, repo, aport)
plugins_prebuild(conf, aport, progress)
- local success = build_aport(aport, conf.repodest, aport.logfile, opts.R)
+ local success = build_aport(aport, conf.aportsdir, conf.repodest, aport.logfile, opts.R)
plugins_postbuild(conf, aport, success)
if success then
built = built + 1