From b479b9a7ba3d23f1ed599ea76376edd5f53557ce Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 22 Oct 2015 18:20:09 +0200 Subject: [PATCH] xbps-src: bulk: only abort if rval is 1, ignore broken/skipped pkgs. Issue #2804 --- common/xbps-src/shutils/bulk.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh index f979e0d65c8..88738a4d89b 100644 --- a/common/xbps-src/shutils/bulk.sh +++ b/common/xbps-src/shutils/bulk.sh @@ -67,7 +67,7 @@ bulk_build() { } bulk_update() { - local args="$1" pkgs f + local args="$1" pkgs f rval pkgs="$(bulk_build ${args})" if [ -z "$pkgs" ]; then @@ -85,9 +85,9 @@ bulk_update() { if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then chroot_handler pkg $XBPS_TARGET_PKG else - $XBPS_LIBEXECDIR/build.sh $f $f pkg $XBPS_CROSS_BUILD || return 1 + $XBPS_LIBEXECDIR/build.sh $f $f pkg $XBPS_CROSS_BUILD fi - if [ $? -ne 0 ]; then + if [ $? -eq 1 ]; then msg_error "xbps-src: failed to build $pkgver pkg!\n" fi done