From ffa3056010b6ea104a8d772d0349a705575a13ca Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Tue, 8 Jul 2008 10:57:57 +0200 Subject: 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 Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.3-54-g00ecf