[Debian-tex-commits] SVN lmodern commit + diffs: r2934 - lmodern/trunk/debian

[Florent Rougon]

Author: frn
Date: 2007-06-01 19:45:22 +0000 (Fri, 01 Jun 2007)
New Revision: 2934

Modified:
   lmodern/trunk/debian/lmodern.preinst
Log:
* Forgot to print the md5sum in dpkg_md5sum()...

* Error checking in calls of dpkg_md5sum()


Modified: lmodern/trunk/debian/lmodern.preinst
===================================================================
--- lmodern/trunk/debian/lmodern.preinst	2007-06-01 19:31:21 UTC (rev 2933)
+++ lmodern/trunk/debian/lmodern.preinst	2007-06-01 19:45:22 UTC (rev 2934)
@@ -104,6 +104,7 @@
             | grep -F " $conffile " | cut -d ' ' -f 3)
 
     if [ -n "$sum" ]; then
+        echo "$sum"
         res=0
     else
         echo "Conffile '$conffile' not found in package '$package'" >&2
@@ -119,7 +120,7 @@
     if ! [ -r $oldfile ] ; then
 	return 0
     fi
-    originalmd5sum=$(dpkg_md5sum lmodern "$oldfile")
+    originalmd5sum=$(dpkg_md5sum lmodern "$oldfile") || exit 1
     installedmd5sum=$(md5sum "$oldfile" |  cut -d ' ' -f 1)
     if [ "$originalmd5sum" = "$installedmd5sum" ] ; then
         echo "Removing obsolete, unchanged conffile $oldfile"
@@ -146,7 +147,7 @@
     oldfile="$3"
     newloc="$4"
 
-    originalmd5sum=$(dpkg_md5sum "$package" "$oldfile")
+    originalmd5sum=$(dpkg_md5sum "$package" "$oldfile") || exit 1
 
     if ! [ -e "$oldfile" ] ; then
         return 0