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
1 changed files with 2 additions and 7 deletions
|
@ -321,11 +321,6 @@ handledeps() {
|
||||||
[ $# -eq 0 ] && return $R_DEPS_SATISFIED
|
[ $# -eq 0 ] && return $R_DEPS_SATISFIED
|
||||||
|
|
||||||
local deplist="$*"
|
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
|
if [ "$DEP_BIN" = "0" ]; then
|
||||||
return $R_DEPS_MISSING
|
return $R_DEPS_MISSING
|
||||||
|
@ -337,9 +332,9 @@ handledeps() {
|
||||||
local ret=0
|
local ret=0
|
||||||
|
|
||||||
if [ "$ASROOT" = 0 ]; then
|
if [ "$ASROOT" = 0 ]; then
|
||||||
sudo pacman $PACMAN_OPTS -S --asdeps $striplist || ret=$?
|
sudo pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$?
|
||||||
else
|
else
|
||||||
pacman $PACMAN_OPTS -S --asdeps $striplist || ret=$?
|
pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$?
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $ret -ne 0 ]; then
|
if [ $ret -ne 0 ]; then
|
||||||
|
|
Loading…
Add table
Reference in a new issue