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

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xbps-src/shutils/chroot.sh.in
View file

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

2
xbps-src/shutils/common_funcs.sh
View file

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

9
xbps-src/shutils/pkgtarget_funcs.sh.in
View file

@ -30,15 +30,6 @@ install_pkg()
{ {
local curpkgn="$1" fullpkg pkg cdestdir 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. # Remove automatic package dependencies if set.
autoremove_pkg_dependencies $KEEP_AUTODEPS autoremove_pkg_dependencies $KEEP_AUTODEPS