From 8b6343a59a1501c0bf4eac85846fa1853ddb168b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 29 Jun 2011 08:24:32 +0200 Subject: [PATCH] xbps-src: fix remove_pkg(), it's msg_warn(). --- xbps-src/shutils/common_funcs.sh | 9 +++++++++ xbps-src/shutils/pkgtarget_funcs.sh.in | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/xbps-src/shutils/common_funcs.sh b/xbps-src/shutils/common_funcs.sh index 37e9f25567..b9f96dcf7e 100644 --- a/xbps-src/shutils/common_funcs.sh +++ b/xbps-src/shutils/common_funcs.sh @@ -70,6 +70,15 @@ remove_pkgdestdir_sighandler() rm -rf "$XBPS_DESTDIR/${sourcepkg}-${version%_*}" fi msg_red "'${sourcepkg}-${lver}': removed files from DESTDIR...\n" + # + # If XBPS_PREFER_BINPKG_DEPS is set, we should remove those + # package dependencies installed by the target package, do it. + # + if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$base_chroot" ]; then + msg_normal "Removing binary package dependencies...\n" + ${fakeroot_cmd} ${fakeroot_cmd_args} \ + ${XBPS_BIN_CMD} -Rpyf autoremove + fi } var_is_a_function() diff --git a/xbps-src/shutils/pkgtarget_funcs.sh.in b/xbps-src/shutils/pkgtarget_funcs.sh.in index 0565b70717..f9109ae6b8 100644 --- a/xbps-src/shutils/pkgtarget_funcs.sh.in +++ b/xbps-src/shutils/pkgtarget_funcs.sh.in @@ -217,7 +217,7 @@ remove_pkg() ver=$($XBPS_PKGDB_CMD version $pkgname) if [ -z "$ver" ]; then - msg_warning "$pkgname is not installed.\n" + msg_warn "$pkgname is not installed.\n" fi . $XBPS_SHUTILSDIR/stow_funcs.sh