From 5d631d14156bd2c5b0a9065282fda0a390a90214 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 30 Apr 2016 17:57:10 +0200 Subject: [PATCH] libexec/build.sh: force base-files installation to not fail on EEXIST. --- common/xbps-src/libexec/build.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/common/xbps-src/libexec/build.sh b/common/xbps-src/libexec/build.sh index a35f709dec..61a459f69c 100755 --- a/common/xbps-src/libexec/build.sh +++ b/common/xbps-src/libexec/build.sh @@ -100,10 +100,7 @@ fi if [ -z "$CHROOT_READY" -a "$PKGNAME" = "base-files" ]; then msg_normal "Installing $PKGNAME into masterdir...\n" _log=$(mktemp --tmpdir || exit 1) - if [ -n "$XBPS_BUILD_FORCEMODE" ]; then - _flags="-f" - fi - XBPS_ARCH=$XBPS_MACHINE $XBPS_INSTALL_CMD ${_flags} -y $PKGNAME >${_log} 2>&1 + XBPS_ARCH=$XBPS_MACHINE $XBPS_INSTALL_CMD -yf $PKGNAME >${_log} 2>&1 if [ $? -ne 0 ]; then msg_red "Failed to install $PKGNAME into masterdir, see below for errors:\n" cat ${_log}