Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Sun, 19 Aug 2018 08:34:24
Message-Id: 1534667650.b4de28372738f421ce5b0b808bcb82b5d6021ab4.grobian@gentoo
1 commit: b4de28372738f421ce5b0b808bcb82b5d6021ab4
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 19 08:34:10 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 19 08:34:10 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b4de2837
7
8 scripts/bootstrap-prefix: add workaround instructions for download problems
9
10 scripts/bootstrap-prefix.sh | 26 +++++++++++++++++++++++---
11 1 file changed, 23 insertions(+), 3 deletions(-)
12
13 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
14 index ad21815f9e..bb25d293de 100755
15 --- a/scripts/bootstrap-prefix.sh
16 +++ b/scripts/bootstrap-prefix.sh
17 @@ -2561,6 +2561,7 @@ EOF
18 # deal with the bash-constructs we use in stage3 and onwards
19 hash -r
20
21 + local https_needed=no
22 if ! [[ -e ${EPREFIX}/.stage2-finished ]] \
23 && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage2_log ; then
24 # stage 2 fail
25 @@ -2573,14 +2574,23 @@ EOF
26 for log in "${EPREFIX}"{/tmp,}/var/tmp/portage/*/*/temp/build.log ; do
27 [[ -e ${log} ]] || continue
28 echo " ${log}"
29 + grep -q "HTTPS support not compiled in" "${log}" && https_needed=yes
30 done
31 [[ -e ${log} ]] || echo " (no build logs found?!?)"
32 + if [[ ${https_needed} == "yes" ]] ; then
33 + cat << EOF
34 +It seems one of your logs indicates a download problem due to missing
35 +HTTPS support. If this appears to be the problem for real, you can work
36 +around this for now by downloading the file manually and placing it in
37 + "${EPREFIX}"/usr/portage/distfiles
38 +I will find it when you run me again. If this is NOT the problem, then
39 +EOF
40 + fi
41 cat << EOF
42 I have no clue, really. Please find friendly folks in #gentoo-prefix on
43 irc.gentoo.org, gentoo-alt@l.g.o mailing list, or file a bug
44 -at bugs.gentoo.org under Gentoo/Alt, Prefix Support. I am defeated.
45 -I am of no use here any more.
46 -Maybe you can find some clues in ${EPREFIX}/stage2.log
47 +at bugs.gentoo.org under Gentoo/Alt, Prefix Support.
48 +Remember you might find some clues in ${EPREFIX}/stage2.log
49 EOF
50 exit 1
51 fi
52 @@ -2601,8 +2611,18 @@ EOF
53 for log in "${EPREFIX}"{/tmp,}/var/tmp/portage/*/*/temp/build.log ; do
54 [[ -e ${log} ]] || continue
55 echo " ${log}"
56 + grep -q "HTTPS support not compiled in" "${log}" && https_needed=yes
57 done
58 [[ -e ${log} ]] || echo " (no build logs found?!?)"
59 + if [[ ${https_needed} == "yes" ]] ; then
60 + cat << EOF
61 +It seems one of your logs indicates a download problem due to missing
62 +HTTPS support. If this appears to be the problem for real, you can work
63 +around this for now by downloading the file manually and placing it in
64 + "${EPREFIX}"/usr/portage/distfiles
65 +I will find it when you run me again. If this is NOT the problem, then
66 +EOF
67 + fi
68 cat << EOF
69 I have no clue, really. Please find friendly folks in #gentoo-prefix on
70 irc.gentoo.org, gentoo-alt@l.g.o mailing list, or file a bug