Gentoo Archives: gentoo-portage-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCH] phase-helpers.sh: Loop over A rather than SRC_URI in __eapi0_pkg_nofetch.
Date: Thu, 23 Mar 2017 10:56:28
Message-Id: 22739.43414.164025.892737@a1i15.kph.uni-mainz.de
1 Looping over SRC_URI also outputs non-filename elements (e.g, use
2 conditionals) which is avoided when looping over A.
3
4 Gentoo-Bug: 613132
5 ---
6 bin/phase-helpers.sh | 8 ++++----
7 1 file changed, 4 insertions(+), 4 deletions(-)
8
9 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
10 index 9e4e6a2f8..e1dcfd5e8 100644
11 --- a/bin/phase-helpers.sh
12 +++ b/bin/phase-helpers.sh
13 @@ -1,5 +1,5 @@
14 #!/bin/bash
15 -# Copyright 1999-2013 Gentoo Foundation
16 +# Copyright 1999-2017 Gentoo Foundation
17 # Distributed under the terms of the GNU General Public License v2
18
19 export DESTTREE=/usr
20 @@ -726,11 +726,11 @@ einstall() {
21 }
22
23 __eapi0_pkg_nofetch() {
24 - [ -z "${SRC_URI}" ] && return
25 + [[ -z ${A} ]] && return
26
27 - elog "The following are listed in SRC_URI for ${PN}:"
28 + elog "The following files cannot be fetched for ${PN}:"
29 local x
30 - for x in $(echo ${SRC_URI}); do
31 + for x in ${A}; do
32 elog " ${x}"
33 done
34 }
35 --
36 2.12.1

Replies