[pacman-dev] CVS update of pacman-lib/scripts (makepkg)

[Aaron Griffin]

    Date: Friday, February 9, 2007 @ 14:16:15
  Author: aaron
    Path: /home/cvs-pacman/pacman-lib/scripts

Modified: makepkg (1.46 -> 1.47)

* Fix #2982 - use -Rs to remove deps
* "pacman3" seems to have snuck in there somehow, fixed that


---------+
 makepkg |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Index: pacman-lib/scripts/makepkg
diff -u pacman-lib/scripts/makepkg:1.46 pacman-lib/scripts/makepkg:1.47
--- pacman-lib/scripts/makepkg:1.46	Thu Feb  8 00:24:18 2007
+++ pacman-lib/scripts/makepkg	Fri Feb  9 14:16:15 2007
@@ -306,7 +306,7 @@
 removedeps() {
 	if [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then
 		msg "Removing installed dependencies..."
-		pacman3 $PACMAN_OPTS -R $makedeplist $deplist
+		pacman $PACMAN_OPTS -Rs $makedeplist $deplist
 		# fixes bug #6215
 	elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then
 		msg "Removing installed dependencies..."
@@ -314,7 +314,7 @@
 			export FAKEROOTKEY2=$FAKEROOTKEY
 			unset FAKEROOTKEY
 		fi
-		sudo pacman3 $PACMAN_OPTS -R $makedeplist $deplist
+		sudo pacman $PACMAN_OPTS -Rs $makedeplist $deplist
 		if [ "$INFAKEROOT" = "1" ]; then
 			export FAKEROOTKEY=$FAKEROOTKEY2
 			unset FAKEROOTKEY2