From 92d947b000ca27cd446c7050dfd45c2d4fb5113f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 2 Mar 2010 11:01:15 +0000 Subject: abuild: wait 30 seconds for apk lockfile. improve error reporting --- abuild.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/abuild.in b/abuild.in index e0d726b..7668423 100755 --- a/abuild.in +++ b/abuild.in @@ -811,7 +811,13 @@ builddeps() { uninstall_after=".makedepends-$pkgname $uninstall_after" if [ -n "$install_deps" ] && [ -z "$recursive" ]; then + # make a --simluate run first to detect missing deps + # apk-tools --virtual is no goot at reporting those. $SUDO apk add --repository "$apkcache" \ + --wait 30 \ + --simulate --quiet $deps || return 1 + $SUDO apk add --repository "$apkcache" \ + --wait 30 \ --virtual .makedepends-$pkgname $deps \ && return 0 fi @@ -834,6 +840,7 @@ builddeps() { cd "$dir" && $0 -k -r apkcache || return 1 done $SUDO apk add -u --repository "$apkcache" \ + --wait 30 \ --virtual .makedepends-$pkgname $deps } @@ -945,12 +952,13 @@ post_add() { post_add $i || return 1 fi done - $SUDO apk add -u "$pkgf" || die "Failed to install $1" + $SUDO apk add --wait 30 -u "$pkgf" || die "Failed to install $1" } installdeps() { local deps i - sudo apk add --repository "$apkcache" --virtual .makedepends-$pkgname \ + sudo apk add --wait 30 --repository "$apkcache" \ + --virtual .makedepends-$pkgname \ $makedepends } -- cgit v1.2.3