Merged updated patch to trunk

This commit is contained in:
Jeremy Huntwork 2005-12-01 01:07:27 +00:00
parent c506b99523
commit 782efe80dd

View file

@ -7,10 +7,10 @@ Description: Allow jhalfs to work with a md5sum program
that doesn't accept '-' as a filename, like the one shipped with that doesn't accept '-' as a filename, like the one shipped with
Debian 3.1 stable. Debian 3.1 stable.
--- jhalfs.orig 2005-11-01 07:10:00.104763416 -0500 --- jhalfs.orig 2005-12-01 00:57:13.000000000 +0000
+++ jhalfs 2005-11-01 07:10:02.472416413 -0500 +++ jhalfs 2005-12-01 00:57:26.000000000 +0000
@@ -192,9 +192,12 @@ @@ -260,9 +260,12 @@
DIR=`echo $1 | sed -e 's@-doc@@' -e 's@-linuxthreads@@' -e 's@-libidn@@'` DIR=`echo $1 | sed 's@-doc@@;s@-linuxthreads@@;s@-libidn@@;s@-testsuite@@'`
# Find the md5 sum for this package. # Find the md5 sum for this package.
- if [ $2 != MD5SUMS ] ; then MD5=`grep " $2" MD5SUMS` ; fi - if [ $2 != MD5SUMS ] ; then MD5=`grep " $2" MD5SUMS` ; fi
@ -24,7 +24,7 @@ Debian 3.1 stable.
case $DL in case $DL in
wget ) wget )
wget $HTTP/$DIR/$2 wget $HTTP/$DIR/$2
@@ -206,7 +209,7 @@ @@ -274,7 +277,7 @@
echo "$DL not supported at this time." echo "$DL not supported at this time."
;; ;;
esac esac
@ -33,7 +33,7 @@ Debian 3.1 stable.
case $DL in case $DL in
wget ) wget )
wget -c $HTTP/$DIR/$2 wget -c $HTTP/$DIR/$2
@@ -219,8 +222,11 @@ @@ -287,8 +290,11 @@
;; ;;
esac esac
fi fi
@ -45,5 +45,5 @@ Debian 3.1 stable.
+ exit 1 + exit 1
+ fi + fi
fi fi
} if [ $2 != MD5SUMS ] ; then
echo `grep "$MD5" MD5SUMS` >> MD5SUMS-$VERSION