From be9c85aa53cd0952992c55199cd5541c0c8ce11d Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Thu, 25 Oct 2012 15:33:40 -0400
Subject: Refactor printing logic in ob_parse_dep().

---
(limited to 'lib')

diff --git a/lib/deps.sh b/lib/deps.sh
index 03f0685..c5da438 100644
--- a/lib/deps.sh
+++ b/lib/deps.sh
@@ -119,19 +119,18 @@ ob_parse_dep()
 		eval ${_obpd_comp_var}=\"\$\{_obpd_${_obpd_comp}\}\"
 	done
 
-	if [ -z "${_obpd_host_arch}" ]; then
-		printf '%s' "${_obpd_pkg}"
-		[ -n "${_obpd_archqual}" ] && printf ':%s' "${_obpd_archqual}"
-		[ -n "${_obpd_ver}" ] && printf ' (%s %s)' "${_obpd_rel}" "${_obpd_ver}"
-		[ -n "${_obpd_arches}" ] && printf ' [%s]' "${_obpd_arches}"
-		printf '\n'
-	elif _ob_dep_arch_is_concerned "${_obpd_host_arch}" "${_obpd_arches}"; then
-		printf '%s' "${_obpd_pkg}"
-		[ -n "${_obpd_archqual}" ] && printf ':%s' "${_obpd_archqual}"
-		[ -n "${_obpd_ver}" ] && printf ' (%s %s)' "${_obpd_rel}" "${_obpd_ver}"
-		printf '\n'
+	if [ -n "${_obpd_host_arch}" ] && ! _ob_dep_arch_is_concerned \
+			"${_obpd_host_arch}" "${_obpd_arches}"; then
+		_ob_return 0
+		return ${?}
 	fi
 
+	printf '%s' "${_obpd_pkg}"
+	[ -n "${_obpd_archqual}" ] && printf ':%s' "${_obpd_archqual}"
+	[ -n "${_obpd_ver}" ] && printf ' (%s %s)' "${_obpd_rel}" "${_obpd_ver}"
+	[ -z "${_obpd_host_arch}" -a -n "${_obpd_arches}" ] && \
+		printf ' [%s]' "${_obpd_arches}"
+
 	_ob_return 0
 	return ${?}
 }
--
cgit v0.9.1