diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2006-02-17 22:07:50 +0100 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2006-02-17 22:07:50 +0100 |
| commit | a6a997ca22176da29a15570fe4899f115d2fddde (patch) | |
| tree | ce1685a7a199a1a1ea8aea7ca43c2a6c926bd85a | |
| parent | 48cc9f3beb7053f51fcdabe25439faae648b6370 (diff) | |
| download | pacman-a6a997ca22176da29a15570fe4899f115d2fddde.tar.gz pacman-a6a997ca22176da29a15570fe4899f115d2fddde.tar.xz | |
partial support for version comparators (patch from VMiklos <vmiklos@frugalware.org>)
| -rwxr-xr-x | scripts/makepkg | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/makepkg b/scripts/makepkg index 718ddc87..21e95b84 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -155,7 +155,6 @@ handledeps() { error "Failed to install missing dependencies." exit 1 fi - # TODO: check deps again to make sure they were resolved elif [ "$DEP_SUDO" = "1" ]; then # install missing deps from binary packages (using pacman -S and sudo) msg "Installing missing dependencies..." @@ -174,7 +173,6 @@ handledeps() { error "Failed to install missing dependencies." exit 1 fi - # TODO: check deps again to make sure they were resolved elif [ "$DEP_SRC" = "1" ]; then # install missing deps by building them from source. # we look for each package name in $ABSROOT and build it. @@ -210,7 +208,6 @@ handledeps() { exit 1 fi done - # TODO: check deps again to make sure they were resolved else missingdeps=1 fi @@ -434,6 +431,12 @@ if [ `type -p pacman` -a "$NODEPS" = "0" ]; then if [ $? -gt 0 ]; then exit 1 fi + # check deps again to make sure they were resolved + deplist=`checkdeps ${depends[@]}` + if [ ! -z "$deplist" ]; then + error "Failed to install missing dependencies." + exit 1 + fi msg "Checking Buildtime Dependencies..." makedeplist=`checkdeps ${makedepends[@]}` handledeps $makedeplist |