From 9f7bfc772a01b1d6f8797b3ba9a88bb6b88643f3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 22 Dec 2008 00:51:34 +0100 Subject: [PATCH] stow_func.sh::unstow_pkg(): dont play with flist in metapkgs. --HG-- extra : convert_revision : be2fa0ab535da930ce86824e9fceef786e55a541 --- shutils/stow_funcs.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/shutils/stow_funcs.sh b/shutils/stow_funcs.sh index 59be265324f..291386fdc27 100644 --- a/shutils/stow_funcs.sh +++ b/shutils/stow_funcs.sh @@ -106,7 +106,10 @@ unstow_pkg() fi cd $XBPS_PKGMETADIR/$pkgname || exit 1 - if [ ! -f flist ]; then + if [ "$build_style" = "meta-template" ]; then + # If it's a metapkg, do nothing. + : + elif [ ! -f flist ]; then msg_error "$pkg is incomplete, missing flist." elif [ ! -w flist ]; then msg_error "$pkg cannot be removed (permission denied)." @@ -133,7 +136,7 @@ unstow_pkg() # Remove metadata dir. rm -rf $XBPS_PKGMETADIR/$pkgname - $XBPS_REGPKGDB_CMD unregister $pkgname $ver + return $? }