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

[Dan McGee]

    Date: Saturday, March 3, 2007 @ 13:38:57
  Author: dan
    Path: /home/cvs-pacman/pacman-lib/scripts

Modified: makepkg (1.55 -> 1.56)

* file utility was updated to version 4.20, removing code that was there to
  catch a bug in 4.19.


---------+
 makepkg |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)


Index: pacman-lib/scripts/makepkg
diff -u pacman-lib/scripts/makepkg:1.55 pacman-lib/scripts/makepkg:1.56
--- pacman-lib/scripts/makepkg:1.55	Wed Feb 28 00:08:25 2007
+++ pacman-lib/scripts/makepkg	Sat Mar  3 13:38:57 2007
@@ -769,23 +769,17 @@
 		file_type=$(file -biz "$file")
 		unset cmd
 		case "$file_type" in
-			# START REMOVE
-			# TODO remove this with release of file v4.20, temp bugfix
-			*application/empty*)
-			cmd="tar -xf $file"
-			warning "file had trouble detecting type, assuming tar" ;;
-			# END REMOVE
 			*application/x-tar*)
-			cmd="tar -xf $file" ;;
+				cmd="tar -xf $file" ;;
 			*application/x-zip*)
-			unziphack=1
-			cmd="unzip -qqo $file" ;;
+				unziphack=1
+				cmd="unzip -qqo $file" ;;
 			*application/x-cpio*)
-			cmd="bsdtar -x -f $file" ;;
+				cmd="bsdtar -x -f $file" ;;
 			*application/x-gzip*)
-			cmd="gunzip -f $file" ;;
+				cmd="gunzip -f $file" ;;
 			*application/x-bzip*)
-			cmd="bunzip2 -f $file" ;;
+				cmd="bunzip2 -f $file" ;;
 		esac
 		if [ "$cmd" != "" ]; then
 			msg2 "$cmd"