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

[Dan McGee]

    Date: Friday, March 9, 2007 @ 00:11:47
  Author: dan
    Path: /home/cvs-pacman/pacman-lib/scripts

Modified: makepkg (1.57 -> 1.58)

* Another slight update, getting rid of -rf flags and clarifying a message.


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


Index: pacman-lib/scripts/makepkg
diff -u pacman-lib/scripts/makepkg:1.57 pacman-lib/scripts/makepkg:1.58
--- pacman-lib/scripts/makepkg:1.57	Thu Mar  8 23:35:04 2007
+++ pacman-lib/scripts/makepkg	Fri Mar  9 00:11:47 2007
@@ -492,7 +492,7 @@
 		read answer
 		answer=$(echo $answer | tr [:upper:] [:lower:])
 		if [ "$answer" = "yes" -o "$answer" = "y" ]; then
-			rm -rf "$SRCDEST"/*
+			rm "$SRCDEST"/*
 			if [ $? -ne 0 ]; then
 				error "Problem removing files; you may not have correct permissions in $SRCDEST"
 				exit 1
@@ -507,8 +507,9 @@
 			exit 0
 		fi
 	else
-		# SRCDEST undefined (should never happen)
+		# $SRCDEST is $startdir, two possibilities
 		error "Source destination must be defined in makepkg.conf."
+		plain "In addition, please run makepkg -C outside of your cache directory."
 		exit 1
 	fi
 fi