From 07600317c87491a503f020f94a6486b113e23e3a Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 26 Mar 2014 15:33:49 +0000
Subject: main/aports-build: add support for override buildrepo command

This is so we can configure what buildrepo implementation should be
used.

We also remove the buildrepo_opts option as it becomes redundant.
---
 main/aports-build/APKBUILD     | 8 ++++----
 main/aports-build/aports-build | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'main')

diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD
index 1fd0cded5..37ad58e7f 100644
--- a/main/aports-build/APKBUILD
+++ b/main/aports-build/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=aports-build
 pkgver=0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux"
 url="http://alpinelinux.org"
 arch="noarch"
@@ -39,12 +39,12 @@ package() {
 		"$pkgdir"/etc/conf.d/aports-build || return 1
 }
 
-md5sums="da5b3655b94700461cd8780d0197634f  aports-build
+md5sums="6ee5c185fdb151780dcc80942e28eec9  aports-build
 784238e965ca025c0c6ed13c8af01613  aports-build.initd
 cdc49e0ef145de72131972a575f20e7b  aports-build.confd"
-sha256sums="cea8c0af310cf884528835ed728971c5cd4fa2e79ab04f0c49f3652843327f91  aports-build
+sha256sums="bcd3f72d11802022c910329f04514d54c53979238c53532b0e4097155804a12b  aports-build
 88215b5969e5ffeda549c6e31de4563569ddee2ac3220c381d40f382d43f8323  aports-build.initd
 519744cdb4be83e5da1c22d4aa93c7ef97d66e03565e84b710bc21c94b82047e  aports-build.confd"
-sha512sums="07aae9a60d65f8162c7ff2709ad16300007890a16fe081d7cc827b931a3c6172175266a0fc08182f5ca5d80ed0b5748801c5fbb2fc23dba3e29659aecbb27d5a  aports-build
+sha512sums="54661751ef5756df0416092f86777f9014855a7e8969ea41ccebcdcd808a858686d17790e0932c73752cf3aad7a02d7b09f800fa7db2f8d34a067b6ff1965049  aports-build
 2ef2fa6de4118209ab93a56216f106ac32078df762f4d67e900976c28bea96d44806f4679ef966472a3eb05fdaf1648aab17c0eaa897e8a06b1272766f29d22b  aports-build.initd
 fbe8ed4b1fbfc979de62302873e99c67bab751a7fcd921c3b23815f535cedb34c717e82b3c223f88e06498a573cbd147a73db7bf5adbb5e1947ac75fcb8edcb4  aports-build.confd"
diff --git a/main/aports-build/aports-build b/main/aports-build/aports-build
index 75cb24832..7690753d6 100644
--- a/main/aports-build/aports-build
+++ b/main/aports-build/aports-build
@@ -39,6 +39,7 @@ isodir=$HOME/alpine-iso
 packages=${REPOSDIR:-$HOME/packages}
 repos=${REPOS:-"main testing"}
 
+: ${buildrepo:="buildrepo -p"}
 : ${upload_host:="rsync.alpinelinux.org"}
 : ${upload_prefix:="$upload_host:alpine"}
 upload_pkg="$upload_prefix/$rel/"
@@ -139,7 +140,7 @@ while true; do
 #			cd $i && abuild -Rk )||break
 #		done
 #	)
-	if ! buildrepo -p $buildrepo_opts $repos >"$logdir"/$hostname.log 2>&1 ; then
+	if ! $buildrepo $repos >"$logdir"/$hostname.log 2>&1 ; then
 		local errlog=$hostname.$_current.log
 		cp "$logdir"/$hostname.log "$logdir"/$errlog
 		# todo: revert last commit?
-- 
cgit v1.2.3