phase-helpers.sh: Move assert() from isolated-functions to here

assert() is no longer used internally.

Signed-off-by: Ulrich Müller <[email protected]>

Author: ulm

bin/isolated-functions.sh

@@ -22,14 +22,6 @@ fi
 # It _must_ preceed all the calls to die and assert.
 shopt -s expand_aliases
 
-assert() {
-	local x pipestatus=( "${PIPESTATUS[@]}" )
-	___eapi_has_assert || die "'${FUNCNAME}' banned in EAPI ${EAPI}"
-	for x in "${pipestatus[@]}"; do
-		[[ ${x} -eq 0 ]] || die "$@"
-	done
-}
-
 # Simplified version of pipestatus() for internal use
 __pipestatus() {
 	local status=( "${PIPESTATUS[@]}" ) s ret=0

bin/phase-helpers.sh

@@ -28,6 +28,14 @@ if ! contains_word strip "${PORTAGE_RESTRICT}"; then
         PORTAGE_DOSTRIP+=( / )
 fi
 
+assert() {
+	local x pipestatus=( "${PIPESTATUS[@]}" )
+	___eapi_has_assert || die "'${FUNCNAME}' banned in EAPI ${EAPI}"
+	for x in "${pipestatus[@]}"; do
+		[[ ${x} -eq 0 ]] || die "$@"
+	done
+}
+
 into() {
 	if [[ "$1" == "/" ]]; then
 		export __E_DESTTREE=""