mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-23 00:08:50 -05:00
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>
This commit is contained in:
parent
37b5972212
commit
ffa3056010
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user