moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

partial support for version comparators (patch from VMiklos <vmiklos@frugalware.org>)

This commit is contained in:
Aurelien Foret 2006-02-17 21:07:50 +00:00
parent 48cc9f3beb
commit a6a997ca22
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/makepkg
View File

@ -155,7 +155,6 @@ handledeps() {
error "Failed to install missing dependencies." error "Failed to install missing dependencies."
exit 1 exit 1
fi fi
# TODO: check deps again to make sure they were resolved
elif [ "$DEP_SUDO" = "1" ]; then elif [ "$DEP_SUDO" = "1" ]; then
# install missing deps from binary packages (using pacman -S and sudo) # install missing deps from binary packages (using pacman -S and sudo)
msg "Installing missing dependencies..." msg "Installing missing dependencies..."
@ -174,7 +173,6 @@ handledeps() {
error "Failed to install missing dependencies." error "Failed to install missing dependencies."
exit 1 exit 1
fi fi
# TODO: check deps again to make sure they were resolved
elif [ "$DEP_SRC" = "1" ]; then elif [ "$DEP_SRC" = "1" ]; then
# install missing deps by building them from source. # install missing deps by building them from source.
# we look for each package name in $ABSROOT and build it. # we look for each package name in $ABSROOT and build it.
@ -210,7 +208,6 @@ handledeps() {
exit 1 exit 1
fi fi
done done
# TODO: check deps again to make sure they were resolved
else else
missingdeps=1 missingdeps=1
fi fi
@ -434,6 +431,12 @@ if [ `type -p pacman` -a "$NODEPS" = "0" ]; then
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
exit 1 exit 1
fi 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..." msg "Checking Buildtime Dependencies..."
makedeplist=`checkdeps ${makedepends[@]}` makedeplist=`checkdeps ${makedepends[@]}`
handledeps $makedeplist handledeps $makedeplist