xbps-src: make -K work when run_func returns an error.

This commit is contained in:
Juan RP 2011-07-06 10:06:49 +02:00
parent 3d3ee4ac40
commit 86d0b0adcf
3 changed files with 2 additions and 11 deletions

View File

@ -314,7 +314,7 @@ xbps_chroot_handler()
env IN_CHROOT=1 LANG=C \
${chroot_cmd} $XBPS_MASTERDIR /bin/sh || rv=$?
else
[ -n "$KEEP_WRKSRC" ] && arg="-C"
[ -n "$KEEP_WRKSRC" ] && arg="$arg -C"
[ -n "$KEEP_AUTODEPS" ] && arg="$arg -K"
[ -n "$DESTDIR_ONLY_INSTALL" ] && arg="$arg -D"

View File

@ -30,7 +30,7 @@ run_func_error()
{
local lver func="$1"
remove_pkgdestdir_sighandler ${pkgname}
remove_pkgdestdir_sighandler ${pkgname} $KEEP_AUTODEPS
if [ -n "${revision}" ]; then
lver="${version}_${revision}"

View File

@ -30,15 +30,6 @@ install_pkg()
{
local curpkgn="$1" fullpkg pkg cdestdir
#
# If we are being invoked through the chroot, re-read config file
# to get correct stuff.
#
if [ -n "$IN_CHROOT" ]; then
check_config_vars
set_defvars
fi
# Remove automatic package dependencies if set.
autoremove_pkg_dependencies $KEEP_AUTODEPS