r314 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2007-03-05 11:23:05 +0000 (Mon, 05 Mar 2007)
New Revision: 314

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mdadm.config
   mdadm/trunk/debian/mdadm.postinst
   mdadm/trunk/debian/mkconf
Log:
* Patch by J?\195?\184rn V. Christensen to properly handle multiple email addresses
  for the MAILADDR setting (closes: #413330).

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2007-03-05 11:22:45 UTC (rev 313)
+++ mdadm/trunk/debian/changelog	2007-03-05 11:23:05 UTC (rev 314)
@@ -1,3 +1,10 @@
+mdadm (2.6.1-1~exp.3) experimental; urgency=low
+
+  * Patch by Jørn V. Christensen to properly handle multiple email addresses
+    for the MAILADDR setting (closes: #413330).
+
+ -- martin f. krafft <madduck at debian.org>  Mon,  5 Mar 2007 11:19:18 +0000
+
 mdadm (2.6.1-1~exp.2) experimental; urgency=low
 
   * Updated debconf translations:

Modified: mdadm/trunk/debian/mdadm.config
===================================================================
--- mdadm/trunk/debian/mdadm.config	2007-03-05 11:22:45 UTC (rev 313)
+++ mdadm/trunk/debian/mdadm.config	2007-03-05 11:23:05 UTC (rev 314)
@@ -39,7 +39,7 @@
 
   [ -f $DEBIANCONFIG ] && . $DEBIANCONFIG
   if [ -f $CONFIG ]; then
-    MAILADDR=$(sed -rne 's,^MAILADDR[[:space:]]*([^[:space:]]+).*,\1,p' $CONFIG)
+    MAILADDR=$(sed -rne 's/^MAILADDR[[:space:]]*([^[:space:]]+).*/\1/p' $CONFIG)
   fi
 
   # if $MAIL_TO from $DEBIANCONFIG is set, give it priority. This is because

Modified: mdadm/trunk/debian/mdadm.postinst
===================================================================
--- mdadm/trunk/debian/mdadm.postinst	2007-03-05 11:22:45 UTC (rev 313)
+++ mdadm/trunk/debian/mdadm.postinst	2007-03-05 11:23:05 UTC (rev 314)
@@ -70,7 +70,7 @@
       # if the configuration is writeable but has not been written just
       # before, then edit it to reflect the MAILADDR preference
       if grep -q '^MAILADDR' $CONFIG; then
-        sed -i -e "s,^MAILADDR.*,MAILADDR $MAILADDR," $CONFIG
+        sed -i -e "s/^MAILADDR.*/MAILADDR $MAILADDR/" $CONFIG
       else
         echo "MAILADDR $MAILADDR" >> $CONFIG
       fi

Modified: mdadm/trunk/debian/mkconf
===================================================================
--- mdadm/trunk/debian/mkconf	2007-03-05 11:22:45 UTC (rev 313)
+++ mdadm/trunk/debian/mkconf	2007-03-05 11:23:05 UTC (rev 314)
@@ -22,7 +22,7 @@
   MAILADDR="$MDADM_MAILADDR__"
 else
   # preserve existing MAILADDR
-  MAILADDR="$(sed -ne 's,MAILADDR ,,p' $CONFIG 2>/dev/null || echo root)"
+  MAILADDR="$(sed -ne 's/MAILADDR //p' $CONFIG 2>/dev/null || echo root)"
 fi
 
 generate=0