blob: a55bc4cd5772c11aef80fb9a843dcb37b7339e74 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From e18d6228e7fc1e7601b4c793ef889cfd3e36fc36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Mon, 31 Oct 2016 15:49:29 +0200
Subject: [PATCH] abuild: properly detect failure of dependency installation
---
abuild.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/abuild.in b/abuild.in
index 35b7995..8b6d8dd 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1889,7 +1889,8 @@ builddeps() {
done
$SUDO_APK add --upgrade --repository "$REPODEST/$repo" \
$apk_opt_wait \
- --virtual .makedepends-$pkgname $builddeps
+ --virtual .makedepends-$pkgname $builddeps \
+ || return 1
}
# replace the md5sums in the APKBUILD
@@ -2034,7 +2035,8 @@ deps() {
[ -z "$_quiet" ] && msg "Installing for build:$builddeps"
$SUDO_APK add $_quiet $apk_opt_wait --repository "$REPODEST/$repo" \
--virtual .makedepends-$pkgname \
- $builddeps
+ $builddeps \
+ || return 1
if [ -n "$CBUILDROOT" ]; then
[ -z "$_quiet" ] && msg "Installing for host:$hostdeps"
$SUDO_APK add $_quiet --root "$CBUILDROOT" --repository "$REPODEST/$repo" $apk_opt_wait \
--
2.10.1
|
