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-361031-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QfEK0-0004dy-1o
for garchives@archives.gentoo.org; Fri, 08 Jul 2011 16:54:32 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1C34721C022;
Fri, 8 Jul 2011 16:54:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id DD34221C022
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jul 2011 16:54:23 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 75B6B2AC0F0
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jul 2011 16:54:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id CA9208003D
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jul 2011 16:54:22 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <cff6e7888af31d1db2519ce17d5b30baf5270002.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/ebuild.sh bin/isolated-functions.sh
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: cff6e7888af31d1db2519ce17d5b30baf5270002
Date: Fri, 8 Jul 2011 16:54:22 +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: 9a035b93a7411d7f0b30c10c9abc8529
commit: cff6e7888af31d1db2519ce17d5b30baf5270002
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 8 16:54:09 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jul 8 16:54:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Dcff6e788
Invert has/hasq and use/useq implementations.
We need to migrate away from hasq and useq since they are deprecated
(bug #199722).
---
bin/ebuild.sh | 8 ++++----
bin/isolated-functions.sh | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8c301d8..f9a87af 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -127,19 +127,19 @@ esyslog() {
return 0
}
=20
-use() {
- useq ${1}
+useq() {
+ use ${1}
}
=20
usev() {
- if useq ${1}; then
+ if use ${1}; then
echo "${1#!}"
return 0
fi
return 1
}
=20
-useq() {
+use() {
local u=3D$1
local found=3D0
=20
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 24443ac..a4bd0a9 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -511,19 +511,19 @@ if [[ -z ${XARGS} ]] ; then
esac
fi
=20
-has() {
- hasq "$@"
+hasq() {
+ has "$@"
}
=20
hasv() {
- if hasq "$@" ; then
+ if has "$@" ; then
echo "$1"
return 0
fi
return 1
}
=20
-hasq() {
+has() {
[[ " ${*:2} " =3D=3D *" $1 "* ]]
}
=20