Move has, hasq, and hasv functions to isolated-functions.sh since they do not depend...

svn path=/main/trunk/; revision=2964

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 791625c6d8d12d49e81999588434404e36c68afa..d5e6ef68291143dc6136682d0ac886975d8eba7c 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -144,22 +144,6 @@ useq() {
        fi
 }
 
-has() {
-       hasq "$@"
-}
-
-hasv() {
-       if hasq "$@" ; then
-               echo "$1"
-               return 0
-       fi
-       return 1
-}
-
-hasq() {
-       [[ " ${*:2} " == *" $1 "* ]]
-}
-
 has_version() {
        if [ "${EBUILD_PHASE}" == "depend" ]; then
                die "portageq calls (has_version calls portageq) are not allowed in the global scope"

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 20be25e77ee4a866f9773724e86beb6ce25fdc58..c257a10d50c478e18b79bf1b8e40dea532b6d384 100644 (file)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -206,4 +206,21 @@ RC_ENDCOL="yes"
 RC_INDENTATION=''
 RC_DEFAULT_INDENT=2
 RC_DOT_PATTERN=''
+
+has() {
+       hasq "$@"
+}
+
+hasv() {
+       if hasq "$@" ; then
+               echo "$1"
+               return 0
+       fi
+       return 1
+}
+
+hasq() {
+       [[ " ${*:2} " == *" $1 "* ]]
+}
+
 true