From e2e7b10b0d75d20277e16fa5183fa0fcf2dc54dd Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 9 Apr 2015 19:45:59 +0200
Subject: [PATCH] xbps-src: repair bootstrap-update in the !chroot case.

---
 common/xbps-src/shutils/pkgtarget.sh | 11 +++--------
 xbps-src                             |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index c6befbe3477..6a21c97e40b 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -49,14 +49,9 @@ remove_pkg_autodeps() {
     msg_normal "${pkgver:-xbps-src}: removing autodeps, please wait...\n"
     tmplogf=$(mktemp)
 
-    if [ -z "$CHROOT_READY" ]; then
-        xbps-reconfigure -r $XBPS_MASTERDIR -a >> $tmplogf 2>&1
-        xbps-remove -r $XBPS_MASTERDIR -Ryo >> $tmplogf 2>&1
-    else
-        remove_pkg_cross_deps
-        xbps-reconfigure -a >> $tmplogf 2>&1
-        xbps-remove -Ryo >> $tmplogf 2>&1
-    fi
+    remove_pkg_cross_deps
+    $XBPS_RECONFIGURE_CMD -a >> $tmplogf 2>&1
+    $XBPS_REMOVE_CMD -Ryo >> $tmplogf 2>&1
 
     if [ $? -ne 0 ]; then
         msg_red "${pkgver:-xbps-src}: failed to remove autodeps:\n"
diff --git a/xbps-src b/xbps-src
index 476eb0ecbfc..eeec4cac43d 100755
--- a/xbps-src
+++ b/xbps-src
@@ -294,7 +294,7 @@ install_bbootstrap() {
 }
 
 bootstrap_update() {
-    if [ -z "$CHROOT_READY" -o -z "$IN_CHROOT" ]; then
+    if [ -z "$CHROOT_READY" ]; then
         return
     fi
     remove_pkg_autodeps