| 1 |
commit: 6cfec967ac5ad3894f6ce0e6c7289406bd10d480 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 19 04:26:54 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 19 04:38:13 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cfec967 |
| 7 |
|
| 8 |
scripts/bootstrap.sh: fix emerge --resume args |
| 9 |
|
| 10 |
Since the emerge argument parser change from bug 673400, positional |
| 11 |
arguments must come after all optional arguments. |
| 12 |
|
| 13 |
Reviewed-by: Michael Everitt <m.j.everitt <AT> iee.org> |
| 14 |
Bug: https://bugs.gentoo.org/673400 |
| 15 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 16 |
|
| 17 |
scripts/bootstrap.sh | 5 +++-- |
| 18 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh |
| 21 |
index 3fd1c5a0409..d375542f899 100755 |
| 22 |
--- a/scripts/bootstrap.sh |
| 23 |
+++ b/scripts/bootstrap.sh |
| 24 |
@@ -330,14 +330,15 @@ export USE="-* bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE}" |
| 25 |
if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then |
| 26 |
show_status 3 Emerging packages |
| 27 |
if [[ ${RESUME} -eq 1 ]] ; then |
| 28 |
+ STRAP_EMERGE_POSARGS="" |
| 29 |
STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --resume" |
| 30 |
cp /var/run/bootstrap-mtimedb /var/cache/edb |
| 31 |
else |
| 32 |
- STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} \ |
| 33 |
+ STRAP_EMERGE_POSARGS="\ |
| 34 |
${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \ |
| 35 |
${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB}" |
| 36 |
fi |
| 37 |
- ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} || cleanup 1 |
| 38 |
+ ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${STRAP_EMERGE_POSARGS} || cleanup 1 |
| 39 |
echo ------------------------------------------------------------------------------- |
| 40 |
set_bootstrap_stage 3 |
| 41 |
fi |
Archives