[gentoo-commits] proj/portage:master commit in: bin/

[Ulrich Müller]

commit:     580eb604349b52309c0e70a86adbe12f69faaa7f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 09:55:52 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 08:43:17 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=580eb604

phase-helpers.sh: Loop over A rather than SRC_URI in __eapi0_pkg_nofetch.

Looping over SRC_URI also outputs non-filename elements (e.g, use
conditionals) which is avoided when looping over A.

Gentoo-Bug: 613132
Acked-by: Zac Medico <zmedico <AT> gentoo.org>

 bin/phase-helpers.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 9e4e6a2f8..e1dcfd5e8 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 export DESTTREE=/usr
@@ -726,11 +726,11 @@ einstall() {
 }
 
 __eapi0_pkg_nofetch() {
-       [ -z "${SRC_URI}" ] && return
+       [[ -z ${A} ]] && return
 
-       elog "The following are listed in SRC_URI for ${PN}:"
+       elog "The following files cannot be fetched for ${PN}:"
        local x
-       for x in $(echo ${SRC_URI}); do
+       for x in ${A}; do
                elog "   ${x}"
        done
 }