From c7bf669b74453449d8c423a85ba29facd5852ec5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Mon, 11 May 2015 08:34:29 +0200
Subject: [PATCH] xbps-src: make binary-bootstrap skip remote repos with -N.

---
 xbps-src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xbps-src b/xbps-src
index aa1064b5e53..20f8814d345 100755
--- a/xbps-src
+++ b/xbps-src
@@ -257,7 +257,7 @@ check_build_requirements() {
 
 install_bbootstrap() {
     [ -n "$CHROOT_READY" ] && return
-    if [ -n "$1" ]; then
+    if [ -n "$1" -o -n "$XBPS_SKIP_REMOTEREPOS" ]; then
         unset XBPS_TARGET_PKG
         unset XBPS_INSTALL_ARGS
     fi
@@ -273,7 +273,7 @@ install_bbootstrap() {
     mkdir -p $XBPS_MASTERDIR/var/db/xbps/keys
     cd $XBPS_MASTERDIR
     cp -f $XBPS_COMMONDIR/repo-keys/*.plist $XBPS_MASTERDIR/var/db/xbps/keys
-    ${_bootstrap_arch} xbps-install -S ${XBPS_INSTALL_ARGS} \
+    ${_bootstrap_arch} xbps-install ${XBPS_INSTALL_ARGS:+-S $XBPS_INSTALL_ARGS} \
         --repository=$XBPS_REPOSITORY -c ${XBPS_HOSTDIR}/repocache \
         -r $XBPS_MASTERDIR -y base-chroot${_subarch}
     if [ $? -ne 0 ]; then