From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-940949-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 43500139694
for <garchives@archives.gentoo.org>; Sun, 26 Mar 2017 08:44:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8ABF821C07F;
Sun, 26 Mar 2017 08:44:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 68C0E21C07F
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Mar 2017 08:44:55 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 802BD340E75
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Mar 2017 08:44:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2045573DC
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Mar 2017 08:44:53 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1490517797.580eb604349b52309c0e70a86adbe12f69faaa7f.ulm@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/phase-helpers.sh
X-VCS-Directories: bin/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 580eb604349b52309c0e70a86adbe12f69faaa7f
X-VCS-Branch: master
Date: Sun, 26 Mar 2017 08:44:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 03555c9f-9aed-45ca-a21c-235fb59ec28a
X-Archives-Hash: b404db1ceadf3a779f9020e60f2e6385
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
}