From 21e8243ce570fe3925a9572dd766b98142e988ec Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 9 Jun 2015 09:23:06 +0200
Subject: [PATCH] xbps-src: use XBPS_INSTALL_ARGS to repair bootstrap-update.

---
 etc/defaults.conf | 5 ++---
 xbps-src          | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/etc/defaults.conf b/etc/defaults.conf
index 14f49bc8ddf..b0ab6b10035 100644
--- a/etc/defaults.conf
+++ b/etc/defaults.conf
@@ -15,9 +15,8 @@
 #
 
 # [OPTIONAL]
-# Enable optional arguments to xbps-install. This is useful when you use
-# static binaries and when you need to specify arguments.
-# NOTE: This is only used with the binary-bootstrap target!
+# Enable optional arguments to xbps-install for the host system.
+# Currently used in the binary-bootstrap bootstrap-update targets.
 XBPS_INSTALL_ARGS="--repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current"
 
 # [OPTIONAL]
diff --git a/xbps-src b/xbps-src
index e59c52f7eb8..1b68d5b60b6 100755
--- a/xbps-src
+++ b/xbps-src
@@ -301,7 +301,7 @@ bootstrap_update() {
     msg_normal "xbps-src: cleaning up masterdir...\n"
     rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
     msg_normal "xbps-src: updating $XBPS_MASTERDIR ...\n"
-    ${XBPS_INSTALL_CMD} -yu
+    ${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -Syu
     return $?
 }
 
@@ -451,8 +451,8 @@ if [ -n "$IN_CHROOT" ]; then
     readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec
 else
     readonly XBPS_UHELPER_CMD="xbps-uhelper -r $XBPS_MASTERDIR"
-    readonly XBPS_INSTALL_CMD="xbps-install --repository=$XBPS_REPOSITORY -r $XBPS_MASTERDIR"
-    readonly XBPS_QUERY_CMD="xbps-query -i --repository=$XBPS_REPOSITORY -r $XBPS_MASTERDIR"
+    readonly XBPS_INSTALL_CMD="xbps-install -C /dev/null -c $XBPS_HOSTDIR/repocache --repository=$XBPS_REPOSITORY -r $XBPS_MASTERDIR"
+    readonly XBPS_QUERY_CMD="xbps-query -C /dev/null -c $XBPS_HOSTDIR/repoache -i --repository=$XBPS_REPOSITORY -r $XBPS_MASTERDIR"
     readonly XBPS_RINDEX_CMD="xbps-rindex"
     readonly XBPS_RECONFIGURE_CMD="xbps-reconfigure -r $XBPS_MASTERDIR"
     readonly XBPS_REMOVE_CMD="xbps-remove -r $XBPS_MASTERDIR"