From 9441debf00a7543a7eb620e9f5b6d29d7833f74e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 2 Mar 2015 15:51:51 +0100
Subject: [PATCH] xbps-src: run 'bootstrap-update' on the real masterdir with
 -t.

The real masterdir will be cleaned up and always up-to-date before
creating the temporary masterdir.
---
 xbps-src | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/xbps-src b/xbps-src
index 7d83435132e..d5d7441bc7c 100755
--- a/xbps-src
+++ b/xbps-src
@@ -287,6 +287,15 @@ install_bbootstrap() {
     chroot_prepare $XBPS_TARGET_PKG || msg_error "Failed to initialize chroot!\n"
 }
 
+bootstrap_update() {
+    if [ -z "$CHROOT_READY" -o -z "$IN_CHROOT" ]; then
+        return
+    fi
+    remove_pkg_autodeps
+    ${XBPS_INSTALL_CMD} -yu
+    return $?
+}
+
 masterdir_zap() {
     for f in bin boot builddir destdir dev etc home lib lib32 lib64 mnt \
         opt proc root run sbin sys tmp usr var host media xbps \
@@ -565,12 +574,7 @@ case "$XBPS_TARGET" in
         install_bbootstrap
         ;;
     bootstrap-update)
-        if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then
-            chroot_handler ${XBPS_TARGET} dummy
-        else
-            remove_pkg_autodeps
-            ${XBPS_INSTALL_CMD} -yu
-        fi
+        bootstrap_update
         ;;
     chroot)
         chroot_handler chroot dummy
@@ -608,6 +612,7 @@ case "$XBPS_TARGET" in
     fetch|extract|build|configure|install|pkg)
         BEGIN_INSTALL=1
         read_pkg
+        bootstrap_update
         create_temporary_masterdir
         if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then
             chroot_handler $XBPS_TARGET $XBPS_TARGET_PKG