oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abuild: wait 30 seconds for apk lockfile. improve error reporting

Browse Source
This commit is contained in:
Natanael Copa 2010-03-02 11:01:15 +00:00
parent 8d34be04b0
commit 92d947b000
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
abuild.in
View File

@ -811,7 +811,13 @@ builddeps() {
uninstall_after=".makedepends-$pkgname $uninstall_after" uninstall_after=".makedepends-$pkgname $uninstall_after"
if [ -n "$install_deps" ] && [ -z "$recursive" ]; then 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" \ $SUDO apk add --repository "$apkcache" \
--wait 30 \
--simulate --quiet $deps || return 1
$SUDO apk add --repository "$apkcache" \
--wait 30 \
--virtual .makedepends-$pkgname $deps \ --virtual .makedepends-$pkgname $deps \
&& return 0 && return 0
fi fi
@ -834,6 +840,7 @@ builddeps() {
cd "$dir" && $0 -k -r apkcache || return 1 cd "$dir" && $0 -k -r apkcache || return 1
done done
$SUDO apk add -u --repository "$apkcache" \ $SUDO apk add -u --repository "$apkcache" \
--wait 30 \
--virtual .makedepends-$pkgname $deps --virtual .makedepends-$pkgname $deps
} }
@ -945,12 +952,13 @@ post_add() {
post_add $i || return 1 post_add $i || return 1
fi fi
done done
$SUDO apk add -u "$pkgf" || die "Failed to install $1" $SUDO apk add --wait 30 -u "$pkgf" || die "Failed to install $1"
} }
installdeps() { installdeps() {
local deps i local deps i
sudo apk add --repository "$apkcache" --virtual .makedepends-$pkgname \ sudo apk add --wait 30 --repository "$apkcache" \
--virtual .makedepends-$pkgname \
$makedepends $makedepends
} }