aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-07-08 09:54:09 -0700
committerZac Medico <zmedico@gentoo.org>2011-07-08 09:54:09 -0700
commitcff6e7888af31d1db2519ce17d5b30baf5270002 (patch)
treee7f9e48dd4967417b2c83ac8ddaab4178a6b1968 /bin
parentRepoConfig: ignore missing name if no location (diff)
downloadportage-cff6e7888af31d1db2519ce17d5b30baf5270002.tar.gz
portage-cff6e7888af31d1db2519ce17d5b30baf5270002.tar.bz2
portage-cff6e7888af31d1db2519ce17d5b30baf5270002.zip
Invert has/hasq and use/useq implementations.
We need to migrate away from hasq and useq since they are deprecated (bug #199722).
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ebuild.sh8
-rw-r--r--bin/isolated-functions.sh8
2 files changed, 8 insertions, 8 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8c301d8c9..f9a87afe5 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -127,19 +127,19 @@ esyslog() {
return 0
}
-use() {
- useq ${1}
+useq() {
+ use ${1}
}
usev() {
- if useq ${1}; then
+ if use ${1}; then
echo "${1#!}"
return 0
fi
return 1
}
-useq() {
+use() {
local u=$1
local found=0
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 24443ac1b..a4bd0a95c 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -511,19 +511,19 @@ if [[ -z ${XARGS} ]] ; then
esac
fi
-has() {
- hasq "$@"
+hasq() {
+ has "$@"
}
hasv() {
- if hasq "$@" ; then
+ if has "$@" ; then
echo "$1"
return 0
fi
return 1
}
-hasq() {
+has() {
[[ " ${*:2} " == *" $1 "* ]]
}