From 29b171a284e8680193cedb02cf0e8379a2f38309 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 5 Jan 2015 17:11:23 +0100 Subject: [PATCH] xbps-src: return early in the bootstrap target when all deps are built. This fixes the last issue for the 'bootstrap' target... this requires xbps>=0.43.1 to work properly. --- common/xbps-src/shutils/pkgtarget.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh index 3dfba91968..feef0025fa 100644 --- a/common/xbps-src/shutils/pkgtarget.sh +++ b/common/xbps-src/shutils/pkgtarget.sh @@ -113,11 +113,15 @@ install_pkg() { rm -f ${_log} fi - if [ "$XBPS_TARGET_PKG" = "$sourcepkg" -a "$XBPS_TARGET" != "bootstrap" ]; then - # Package built successfully. Exit directly due to nested install_pkg - # and install_pkg_deps functions. - remove_cross_pkg $cross - exit 0 + if [ "$XBPS_TARGET_PKG" = "$sourcepkg" ]; then + if [ "$XBPS_TARGET" = "bootstrap" ]; then + return 0 + else + # Package built successfully. Exit directly due to nested install_pkg + # and install_pkg_deps functions. + remove_cross_pkg $cross + exit 0 + fi fi }