mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-23 00:08:50 -05:00
partial support for version comparators (patch from VMiklos <vmiklos@frugalware.org>)
This commit is contained in:
parent
48cc9f3beb
commit
a6a997ca22
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user