diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-18 14:30:25 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-18 14:30:25 (EDT) |
| commit | 16a6b4974d54f2f56a8fd38a4438850870c77230 (patch) | |
| tree | 4239715f3dc9ee70f7c540bd00bcdadcbf863b22 | |
| parent | 3076e8c2a1175188f5262b7c8f7bc3f7703841ee (diff) | |
Delimit operands of ob_parse_dep()
| -rw-r--r-- | lib/deps.sh | 4 | ||||
| -rw-r--r-- | src/ob-buildenv.sh | 2 | ||||
| -rw-r--r-- | src/ob-checkbuilddeps.sh | 2 | ||||
| -rwxr-xr-x | tests/lib/ob_parse_dep.sh | 2 |
4 files changed, 5 insertions, 5 deletions
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 |