From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-340625-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QGD5e-0000CG-0c
for garchives@archives.gentoo.org; Sat, 30 Apr 2011 16:32:22 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7ADCB1C02B;
Sat, 30 Apr 2011 16:32:10 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 4BACF1C02B
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Apr 2011 16:32:10 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9E40C1B4023
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Apr 2011 16:32:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 0040F80505
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Apr 2011 16:32:08 +0000 (UTC)
From: "Arfrever Frehtes Taifersar Arahesis" <arfrever@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" <arfrever@gentoo.org>
Message-ID: <15c7e8bd8c6ee7f57d18de6fb8f931059200dd4c.arfrever@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/misc-functions.sh
X-VCS-Directories: bin/
X-VCS-Committer: arfrever
X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis
X-VCS-Revision: 15c7e8bd8c6ee7f57d18de6fb8f931059200dd4c
Date: Sat, 30 Apr 2011 16:32:08 +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
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: da67e032f9ee6cec7a1f2a4cce7bfcca
commit: 15c7e8bd8c6ee7f57d18de6fb8f931059200dd4c
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Gentoo <DO=
T> Org>
AuthorDate: Sat Apr 30 16:30:29 2011 +0000
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> gentoo <DO=
T> org>
CommitDate: Sat Apr 30 16:30:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D15c7e8bd
install_qa_check(): Simplify code and make 'l' a local variable.
---
bin/misc-functions.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index c310998..b28b73f 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -193,10 +193,10 @@ install_qa_check() {
# 3) Null paths are banned because the loader will search $PWD when
# it finds null paths.
local forbidden_dirs=3D"${PORTAGE_BUILDDIR}"
- if [[ -n "$ROOT" ]] && [[ "$ROOT" !=3D "/" ]]; then
- forbidden_dirs=3D"${forbidden_dirs} ${ROOT}"
+ if [[ -n "${ROOT}" && "${ROOT}" !=3D "/" ]]; then
+ forbidden_dirs+=3D" ${ROOT}"
fi
- local dir=3D"" rpath_files=3D$(scanelf -F '%F:%r' -qBR "${D}")
+ local dir l rpath_files=3D$(scanelf -F '%F:%r' -qBR "${D}")
f=3D""
for dir in ${forbidden_dirs}; do
for l in $(echo "${rpath_files}" | grep -E ":${dir}|::|: "); do