jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: simplify a bit resolving deps with binpkgs code.

Browse source
This commit is contained in:
Juan RP 2011-06-25 17:41:52 +02:00
parent 0ee102d8cf
commit 09c08fe732
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xbps-src/shutils/builddep_funcs.sh
View file

@ -85,7 +85,7 @@ install_pkg_deps()
done done
if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then
install_pkg_with_binpkg "${curpkg}" install_pkg_with_binpkg ${curpkg}
if [ $? -eq 255 ]; then if [ $? -eq 255 ]; then
# xbps-bin returned unexpected error # xbps-bin returned unexpected error
return $? return $?
@ -151,7 +151,7 @@ install_dependencies_pkg()
if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then
msg_normal "'$pkgname-${lver}': installing dependencies from binpkgs...\n" msg_normal "'$pkgname-${lver}': installing dependencies from binpkgs...\n"
for i in ${notinstalled_deps}; do for i in ${notinstalled_deps}; do
install_pkg_with_binpkg "${i}" install_pkg_with_binpkg ${i}
done done
rval=$? rval=$?
if [ $rval -eq 255 ]; then if [ $rval -eq 255 ]; then
@ -165,17 +165,6 @@ install_dependencies_pkg()
fi fi
for j in ${notinstalled_deps}; do for j in ${notinstalled_deps}; do
if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then
install_pkg_with_binpkg "${j}"
rval=$?
if [ $rval -eq 255 ]; then
# xbps-bin returned unexpected error (-1)
return $?
elif [ $rval -eq 0 ]; then
# installed successfully
continue
fi
fi
pkgn=$($XBPS_PKGDB_CMD getpkgdepname ${j}) pkgn=$($XBPS_PKGDB_CMD getpkgdepname ${j})
check_pkgdep_matched "${j}" check_pkgdep_matched "${j}"
[ $? -eq 0 ] && continue [ $? -eq 0 ] && continue
@ -185,7 +174,7 @@ install_dependencies_pkg()
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
msg_normal "Installing '$lpkgname' dependency: '$pkgn'.\n" msg_normal "Installing '$lpkgname' dependency: '$pkgn'.\n"
if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then
install_pkg_with_binpkg "${j}" install_pkg_with_binpkg ${j}
rval=$? rval=$?
if [ $rval -eq 255 ]; then if [ $rval -eq 255 ]; then
# xbps-bin returned unexpected error # xbps-bin returned unexpected error