From f1a44611c31f90ecb977966e0cdb0a882885e20c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 5 Jul 2011 09:23:29 +0200 Subject: [PATCH] xbps-src: remove target now returns proper return value. --- xbps-src/shutils/pkgtarget_funcs.sh.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xbps-src/shutils/pkgtarget_funcs.sh.in b/xbps-src/shutils/pkgtarget_funcs.sh.in index 474bae58f9..dd06f8da72 100644 --- a/xbps-src/shutils/pkgtarget_funcs.sh.in +++ b/xbps-src/shutils/pkgtarget_funcs.sh.in @@ -195,7 +195,7 @@ list_pkg_files() # remove_pkg() { - local subpkg ver + local subpkg ver found [ -z $pkgname ] && msg_error "unexistent package, aborting.\n" @@ -205,20 +205,25 @@ remove_pkg() for subpkg in ${subpackages}; do if [ -d "$XBPS_DESTDIR/${subpkg}-${ver%_*}" ]; then rm -rf "$XBPS_DESTDIR/${subpkg}-${ver%_*}" + found=1 fi # Remove leftover files in $wrksrc. if [ -f "${wrksrc}/.xbps_do_install_${subpkg}_done" ]; then rm -f ${wrksrc}/.xbps_do_install_${subpkg}_done + found=1 fi done if [ -d "$XBPS_DESTDIR/${pkgname}-${ver%_*}" ]; then rm -rf "$XBPS_DESTDIR/${pkgname}-${ver%_*}" + found=1 fi [ -f $XBPS_PRE_INSTALL_DONE ] && rm -f $XBPS_PRE_INSTALL_DONE [ -f $XBPS_POST_INSTALL_DONE ] && rm -f $XBPS_POST_INSTALL_DONE [ -f $XBPS_INSTALL_DONE ] && rm -f $XBPS_INSTALL_DONE - return $? + [ -n "$found" ] && return 0 + + return 1 }