summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2008-07-08 10:57:57 +0200
committerDan McGee <dan@archlinux.org>2008-07-15 19:14:23 -0500
commitffa3056010b6ea104a8d772d0349a705575a13ca (patch)
tree467c58df3367de409933177ee6f737874d818502 /scripts
parent37b5972212f9e5d08b28a47f2990ba2b102056da (diff)
Use "pacman -S $dep" in makepkg's dependency resolving
This method is equivalent with pacman's resolvedeps. $dep can be any (versioned) dependency. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in9
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 2ab2aeff..0bff8731 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -321,11 +321,6 @@ handledeps() {
[ $# -eq 0 ] && return $R_DEPS_SATISFIED
local deplist="$*"
- local dep depstrip striplist
- for dep in $deplist; do
- depstrip="$(echo $dep | sed -e 's|=.*$||' -e 's|>.*$||' -e 's|<.*$||')"
- striplist="$striplist $depstrip"
- done
if [ "$DEP_BIN" = "0" ]; then
return $R_DEPS_MISSING
@@ -337,9 +332,9 @@ handledeps() {
local ret=0
if [ "$ASROOT" = 0 ]; then
- sudo pacman $PACMAN_OPTS -S --asdeps $striplist || ret=$?
+ sudo pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$?
else
- pacman $PACMAN_OPTS -S --asdeps $striplist || ret=$?
+ pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$?
fi
if [ $ret -ne 0 ]; then