diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-07-08 09:54:09 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-07-08 09:54:09 -0700 |
commit | cff6e7888af31d1db2519ce17d5b30baf5270002 (patch) | |
tree | e7f9e48dd4967417b2c83ac8ddaab4178a6b1968 | |
parent | d1b230a62f6a58b8e06cfbae2105a5a269d37b24 (diff) | |
download | portage-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).
-rwxr-xr-x | bin/ebuild.sh | 8 | ||||
-rw-r--r-- | bin/isolated-functions.sh | 8 |
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 "* ]] } |