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

[Thijs Kinkhorst]

Author: thijs
Date: 2008-11-16 12:14:46 +0000 (Sun, 16 Nov 2008)
New Revision: 570

Modified:
   trunk/debian/changelog
   trunk/debian/mailman.init
Log:
Further site list detection improvements, thanks Adeodato Sim?\195?\179
for his suggestions.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-11-09 10:50:22 UTC (rev 569)
+++ trunk/debian/changelog	2008-11-16 12:14:46 UTC (rev 570)
@@ -1,3 +1,10 @@
+mailman (1:2.1.11-6) unstable; urgency=high
+
+  * Further site list detection improvements, thanks Adeodato Simó
+    for his suggestions.
+
+ -- Thijs Kinkhorst <thijs at escher.loeki.tv>  Sun, 16 Nov 2008 13:12:34 +0100
+
 mailman (1:2.1.11-5) unstable; urgency=high
 
   * Make init script also cope with non-specified site list.

Modified: trunk/debian/mailman.init
===================================================================
--- trunk/debian/mailman.init	2008-11-09 10:50:22 UTC (rev 569)
+++ trunk/debian/mailman.init	2008-11-16 12:14:46 UTC (rev 570)
@@ -46,10 +46,10 @@
 
 case "$1" in
   start)
-    SITE_LIST=$( grep '^MAILMAN_SITE_LIST' /etc/mailman/mm_cfg.py | cut -d"'" -f 2 )
-    [ -z "$SITE_LIST" ] && SITE_LIST='mailman'
-    if [ "$(/var/lib/mailman/bin/list_lists -b | grep ^${SITE_LIST}$ )" = "" ]; then
-        log_warning_msg "Site list for mailman (usually named mailman) missing."
+    SITE_LIST=$( sed -rne "s/^[[:space:]]*MAILMAN_SITE_LIST[[:space:]]*=[[:space:]]*(['\"])([^'\"]+)\\1/\\2/p" /etc/mailman/mm_cfg.py )
+    [ -n "$SITE_LIST" ] || SITE_LIST='mailman'
+    if ! /var/lib/mailman/bin/list_lists -b | grep -q "^${SITE_LIST}$"; then
+        log_warning_msg "Site list for mailman missing (looking for list named '${SITE_LIST}')."
         log_warning_msg "Please create it; until then, mailman will refuse to start."
         exit 0;
     fi