[Pkg-jed-commit] r572 - jedstate/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2007-02-11 15:49:05 +0100 (Sun, 11 Feb 2007)
New Revision: 572

Modified:
   jedstate/trunk/debian/changelog
   jedstate/trunk/debian/postinst
Log:
Debian release jedstate_0.5.4.transitional.1-5

Modified: jedstate/trunk/debian/changelog
===================================================================
--- jedstate/trunk/debian/changelog	2007-02-11 12:02:23 UTC (rev 571)
+++ jedstate/trunk/debian/changelog	2007-02-11 14:49:05 UTC (rev 572)
@@ -1,3 +1,12 @@
+jedstate (0.5.4.transitional.1-5) unstable; urgency=low
+
+  * debian/postint: Changed short-circuit conditionals by if/then/fi
+    constructs, avoiding premature non-zero exit of this postinst script,
+    since it is run with set -e.  Thanks to Steve Langasek for diagnosing
+    this.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 11 Feb 2007 15:43:26 +0100
+
 jedstate (0.5.4.transitional.1-4) unstable; urgency=low
 
   * debian/gdbmrecent-purge: Added script that works as the jedstate

Modified: jedstate/trunk/debian/postinst
===================================================================
--- jedstate/trunk/debian/postinst	2007-02-11 12:02:23 UTC (rev 571)
+++ jedstate/trunk/debian/postinst	2007-02-11 14:49:05 UTC (rev 572)
@@ -8,10 +8,14 @@
         dir=/etc/jed-init.d
         hook=99jedstate_hook.sl
         chksum=cc8dbd5ddce2ed276c2a8f1cf9cc378d
-        test -f $dir/$hook						\
-            && echo "$chksum  $dir/$hook" | md5sum -c >/dev/null 2>&1	\
-            && rm -f $dir/$hook
-        test -d $dir && rmdir --ignore-fail-on-non-empty $dir
+        if test -f $dir/$hook \
+           && echo "$chksum  $dir/$hook" | md5sum -c >/dev/null 2>&1
+        then
+            rm -f $dir/$hook
+        fi
+        if test -d $dir; then
+            rmdir --ignore-fail-on-non-empty $dir
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)