From 01cd33a44eaf9f92d748a3b92ff3cd84e8b45454 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sun, 09 Sep 2012 17:10:13 -0400
Subject: Return rather than print value in _ob_return.

Don't use _ob_return in command substitutions.  Doing so unsets stack
variables only in a subshell environment.
---
(limited to 'lib/deps.sh')

diff --git a/lib/deps.sh b/lib/deps.sh
index 3dc3460..1820940 100644
--- a/lib/deps.sh
+++ b/lib/deps.sh
@@ -49,7 +49,8 @@ ob_parse_dep()
 				_obpd_host_arch="${OPTARG}"
 				;;
 			?)
-				return $(_ob_return 125)
+				_ob_return 125
+				return ${?}
 				;;
 		esac
 	done
@@ -62,7 +63,8 @@ ob_parse_dep()
 		# Remove leading, trailing, and duplicate spaces.
 		_obpd_dep="$(IFS=' ' echo ${_obpd_dep})"
 	else
-		return $(_ob_return 125)
+		_ob_return 125
+		return ${?}
 	fi
 
 	# <pkg>[:<archqual>] [(<rel> <ver>)] [\[<arches>\]]
@@ -93,7 +95,8 @@ ob_parse_dep()
 		eval ${_obpd_comp_var}=\"\$\{_obpd_${_obpd_comp}\}\"
 	done
 
-	return $(_ob_return 0)
+	_ob_return 0
+	return ${?}
 }
 
 ob_reduce_deps()
@@ -112,7 +115,8 @@ ob_reduce_deps()
 				_obrd_union=true
 				;;
 			?)
-				return $(_ob_return 125)
+				_ob_return 125
+				return ${?}
 				;;
 		esac
 	done
@@ -121,7 +125,8 @@ ob_reduce_deps()
 	if [ "${#}" -eq 1 ]; then
 		_obrd_deps="${1}"
 	else
-		return $(_ob_return 125)
+		_ob_return 125
+		return ${?}
 	fi
 
 	_obrd_orig_ifs="${IFS}"
@@ -137,7 +142,8 @@ ob_reduce_deps()
 		fi
 	done
 
-	return $(_ob_return 0)
+	_ob_return 0
+	return ${?}
 }
 
 _ob_dep_arch_is_concerned()
@@ -164,5 +170,6 @@ _ob_dep_arch_is_concerned()
 		fi
 	done
 
-	return $(_ob_return ${_obdaic_seen_arch})
+	_ob_return ${_obdaic_seen_arch}
+	return ${?}
 }
--
cgit v0.9.1