From 16a6b4974d54f2f56a8fd38a4438850870c77230 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 18 Mar 2019 14:30:25 -0400
Subject: Delimit operands of ob_parse_dep()

---
diff --git a/lib/deps.sh b/lib/deps.sh
index 649cfe0..32b05e8 100644
--- a/lib/deps.sh
+++ b/lib/deps.sh
@@ -246,7 +246,7 @@ ob_reduce_deps()
 			for dep_or in ${dep_and}; do
 				unset IFS
 				dep="$(ob_parse_dep -a "${host_arch}" \
-					-p "${host_plat}" "${dep_or}")"
+					-p "${host_plat}" -- "${dep_or}")"
 				if [ -n "${dep}" ]; then
 					if [ -n "${dep_or_list}" ]; then
 						dep_or_list="${dep_or_list} | "
@@ -263,7 +263,7 @@ ob_reduce_deps()
 			fi
 		else
 			dep="$(ob_parse_dep -a "${host_arch}" \
-				-p "${host_plat}" "${dep_and}")"
+				-p "${host_plat}" -- "${dep_and}")"
 			if [ -n "${dep}" ]; then
 				if [ -n "${dep_list}" ]; then
 					dep_list="${dep_list}, "
diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh
index fc7c472..6d42851 100644
--- a/src/ob-buildenv.sh
+++ b/src/ob-buildenv.sh
@@ -27,7 +27,7 @@ setup_build_helper()
 	IFS=', '
 	for dep in $(ob_get_source_parameter 'Build-Depends'); do
 		unset IFS
-		ob_parse_dep -P dep_pkg "${dep}" >/dev/null
+		ob_parse_dep -P dep_pkg -- "${dep}" >/dev/null
 		if [ -r "${HELPERDIR}/${dep_pkg}" ]; then
 			. "${HELPERDIR}/${dep_pkg}"
 			PATH="${helper_path}:${PATH}"
diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh
index ce9ad15..f5afe81 100644
--- a/src/ob-checkbuilddeps.sh
+++ b/src/ob-checkbuilddeps.sh
@@ -29,7 +29,7 @@ check_dep()
 	local pkg_ver=
 
 	# Leave stdout for caller to collect.
-	ob_parse_dep -P dep_pkg -r dep_rel -v dep_ver "${dep}"
+	ob_parse_dep -P dep_pkg -r dep_rel -v dep_ver -- "${dep}"
 	status="$("${OPKG}" status "${dep_pkg}")"
 
 	if ! printf '%s\n' "${status}" | grep '^Status: .* .* installed$' \
diff --git a/tests/lib/ob_parse_dep.sh b/tests/lib/ob_parse_dep.sh
index 37dabd3..b51b420 100755
--- a/tests/lib/ob_parse_dep.sh
+++ b/tests/lib/ob_parse_dep.sh
@@ -34,7 +34,7 @@ testcase()
 	local result=
 
 	ob_parse_dep -P test_pkg -q test_archqual -r test_rel -v test_ver \
-		-A test_arches "${dep}" >/dev/null
+		-A test_arches -- "${dep}" >/dev/null
 
 	result='ok_'
 	for comp in pkg archqual rel ver arches; do
--
cgit v0.9.1