From a0ea6106348c16e204d4979cab3d9e59bd77c97d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 28 Jun 2011 23:57:31 +0200 Subject: [PATCH] Revert "xbps-src: allow to use install-destdir for pkgs already installed." This reverts commit 4478b5ead3c1a1138728e5d7ea4f4ec3838703ab. --- xbps-src/shutils/pkgtarget_funcs.sh.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xbps-src/shutils/pkgtarget_funcs.sh.in b/xbps-src/shutils/pkgtarget_funcs.sh.in index 1edbbb4db3..0565b70717 100644 --- a/xbps-src/shutils/pkgtarget_funcs.sh.in +++ b/xbps-src/shutils/pkgtarget_funcs.sh.in @@ -52,11 +52,9 @@ install_pkg() check_installed_pkg "$pkg" if [ $? -eq 1 -o $? -eq 0 ]; then instver="$($XBPS_PKGDB_CMD version $pkgname)" - if [ -n "$instver" -a "$install_destdir_target" = "no" ]; then + if [ -n "$instver" ]; then echo "=> $pkgname-$instver already installed." return 0 - elif [ -n "$instver" -a "$install_destdir_target" = "yes" ]; then - echo "=> $pkgname-$instver installed, continuing for DESTDIR installation..." fi fi