[Pkg-mailman-hackers] Pkg-mailman commit - rev 35 - trunk/debian

[Bernd S. Brentrup]

Author: bsb
Date: 2004-03-25 11:06:25 -0700 (Thu, 25 Mar 2004)
New Revision: 35

Modified:
   trunk/debian/changelog
   trunk/debian/preinst
Log:
Starting new release fixing preinst bug.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-03-25 06:56:26 UTC (rev 34)
+++ trunk/debian/changelog	2004-03-25 18:06:25 UTC (rev 35)
@@ -1,3 +1,10 @@
+mailman (2.1.4-3) UNRELEASED; urgency=low
+
+  * NOT YET RELEASED (svn-buildpackage likes it).
+  * Fix bogus test for empty qfiles/ in preinst (bsb, closes: #230033).
+
+ -- Siggy Brentrup <bsb@debian.org>  Thu, 25 Mar 2004 19:03:14 +0100
+
 mailman (2.1.4-2) unstable; urgency=low
 
   * Brown bag release.

Modified: trunk/debian/preinst
===================================================================
--- trunk/debian/preinst	2004-03-25 06:56:26 UTC (rev 34)
+++ trunk/debian/preinst	2004-03-25 18:06:25 UTC (rev 35)
@@ -26,7 +26,7 @@
 
 if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 2.1; then
     # upgrading, make sure the qfiles directory is empty.
-    if [ "$(ls /var/lib/mailman/qfiles | wc)" gt "0" ]; then
+    if ls /var/lib/mailman/qfiles 2>/dev/null | grep -q '.*' ; then
         # uh-oh.
         echo "Queue not cleared, please flush mailman queue and retry upgrade"
         exit 1