summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-12-22 20:20:02 -0500
committerAllan McRae <allan@archlinux.org>2016-12-05 15:20:08 +1000
commit90f1dd165769f3a0e7f7275d3e9c72e902325146 (patch)
tree42599762f0de6e5955c70376098ca0d2fa9e8b68
parent9ce2c9b1872b44cebe1ce54c2a7398fbbc31fc6a (diff)
downloadpacman-90f1dd165769f3a0e7f7275d3e9c72e902325146.tar.xz
makepkg: fix quoting in calls to check_deps
The inside needs quoting, and this is separate from the declartion, which does not (in these cases).
-rw-r--r--scripts/makepkg.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index a97cdc28..0aabc259 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -276,12 +276,12 @@ resolve_deps() {
# deplist cannot be declared like this: local deplist=$(foo)
# Otherwise, the return value will depend on the assignment.
local deplist
- deplist="$(check_deps $*)" || exit 1
+ deplist=$(check_deps "$@") || exit 1
[[ -z $deplist ]] && return $R_DEPS_SATISFIED
if handle_deps $deplist; then
# check deps again to make sure they were resolved
- deplist="$(check_deps $*)" || exit 1
+ deplist=$(check_deps "$@") || exit 1
[[ -z $deplist ]] && return $R_DEPS_SATISFIED
fi
@@ -962,7 +962,7 @@ check_vcs_software() {
client=$(get_vcsclient "$proto") || exit $?
# ensure specified program is installed
local uninstalled
- uninstalled="$(check_deps $client)" || exit 1
+ uninstalled=$(check_deps "$client") || exit 1
# if not installed, check presence in depends or makedepends
if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then
if ! in_array "$client" ${all_deps[@]}; then