xbps-src: added -K flag to KEEP automatic installed deps, cleanups.

This commit is contained in:
Juan RP 2011-07-04 19:07:08 +02:00
parent 16b5107f61
commit 9b52e244c6
9 changed files with 57 additions and 42 deletions

View file

@ -48,6 +48,7 @@ install_pkglist_from_repos()
# ENODEV (19): package depends on missing dependencies.
#
# Any other returned is criticial.
autoremove_pkg_dependencies
msg_red "'${pkgname}': failed to install required dependencies! (error $rval)\n"
msg_error "'${pkgname}': please take a look the logs in \$wrksrc.\n"
fi
@ -81,6 +82,7 @@ install_pkg_from_repos()
# ENODEV (19): package depends on missing dependencies.
#
# Any other returned is criticial.
autoremove_pkg_dependencies
msg_red "'${pkgname}': failed to install '${pkg}' dependency! (error $rval)\n"
msg_error "Please see ${wrksrc}/.xbps_install_${pkgdepname}.log to see what went wrong!\n"
fi
@ -92,6 +94,8 @@ autoremove_pkg_dependencies()
{
local cmd saved_pkgname x f found
[ -n "$KEEP_AUTODEPS" ] && return 0
cmd="${fakeroot_cmd} ${fakeroot_cmd_args} ${XBPS_BIN_CMD}"
# If XBPS_PREFER_BINPKG_DEPS is set, we should remove those
@ -272,6 +276,8 @@ install_dependencies_pkg()
fi
done
[ -z "$notinstalled_deps" ] && return 0
# Install direct build dependencies from binary packages.
if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$base_chroot" ]; then
msg_normal "'$pkg': installing dependencies from repositories ...\n"