From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 19 Jan 2020 04:26:54 +0000 (-0800)
Subject: scripts/bootstrap.sh: fix emerge --resume args
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6cfec967ac5ad3894f6ce0e6c7289406bd10d480;p=gentoo.git

scripts/bootstrap.sh: fix emerge --resume args

Since the emerge argument parser change from bug 673400, positional
arguments must come after all optional arguments.

Reviewed-by: Michael Everitt <m.j.everitt@iee.org>
Bug: https://bugs.gentoo.org/673400
Signed-off-by: Zac Medico <zmedico@gentoo.org>
---

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 3fd1c5a04091..d375542f8998 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -330,14 +330,15 @@ export USE="-* bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE}"
 if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then
 	show_status 3 Emerging packages
 	if [[ ${RESUME} -eq 1 ]] ; then
+		STRAP_EMERGE_POSARGS=""
 		STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --resume"
 		cp /var/run/bootstrap-mtimedb /var/cache/edb
 	else
-		STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} \
+		STRAP_EMERGE_POSARGS="\
 			${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \
 			${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB}"
 	fi
-	${V_ECHO} emerge ${STRAP_EMERGE_OPTS} || cleanup 1
+	${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${STRAP_EMERGE_POSARGS} || cleanup 1
 	echo -------------------------------------------------------------------------------
 	set_bootstrap_stage 3
 fi