[Commit-womb] gnumaint gnumaint

[Jose E. Marchesi]

CVSROOT:        /cvsroot/womb
Module name:    gnumaint
Changes by:     Jose E. Marchesi <jemarch>      06/12/29 03:08:24

Modified files:
        .              : gnumaint 

Log message:
        Updated `do_recemail_operation' in order to read the maintainer email
        from a new mark on the control file ($mntemail:address@hidden). In this
        way the maintainer can reply from any email address.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnumaint?cvsroot=womb&r1=1.10&r2=1.11

Patches:
Index: gnumaint
===================================================================
RCS file: /cvsroot/womb/gnumaint/gnumaint,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gnumaint    29 Dec 2006 02:49:29 -0000      1.10
+++ gnumaint    29 Dec 2006 03:08:24 -0000      1.11
@@ -335,24 +335,24 @@
            ;# Activity response email
            ;#
 
-            ;# Search for maintainer information (from the message email)
-            set maintainer_name {}
+            ;# Search for maintainer email on the control line
             set maintainer_email {}
+            set maintainer_name {}
+            set maintainer_email_regexp "\\\$mntemail:(\[^$\]*)\\\$"
+            regexp $maintainer_email_regexp $body -> maintainer_email
             foreach mnt $maintainersdb {
 
                 set maintainer_name [lindex $mnt 0]
-                set maintainer_email [lindex $mnt 1]
-                if {[string match "*$maintainer_email*" $from]} then {
+                if {$maintainer_email == [lindex $mnt 1]} then {
 
                     ;# Maintainer found
                     break
                 }
             }
-            if {$maintainer_email == ""} then {
+            if {$maintainer_name == ""} then {
 
-                ;# Cannot recognize maintainer: discard email
+                ;# Maintainer not found => discard email
                 break
-
             }
 
            ;# Search for package names on the control line
@@ -375,9 +375,8 @@
                     "received activity control email reply from 
$maintainer_name for packages $pkgs"
 
                 ;# Annotate this packages into the activity file
-                activity_annotate $pkgs $maintainer_name
+                ;#activity_annotate $pkgs $maintainer_name
             }
-
         }
        default {
            ;# Unknown email type. Ignore it.
@@ -472,6 +471,7 @@
             "\n\n-- Please make sure to include the following line in the body 
on your reply --\n"
 
         set control_line {}
+        append control_line "\$mntemail:$maintainer_email\$ "
         foreach pkg $maintainer_pkgs {
             append control_line "\$package:$pkg\$ "
         }
@@ -494,10 +494,10 @@
             [exec $formail -k -X Date -X Reply-to: -X From: -X Subject: -X To: 
<< $out_email_contents]
 
         ;# Send the email using sendmail
-        ;#exec $sendmail -t -bm << $out_email_contents
+        exec $sendmail -t -bm << $out_email_contents
         ;#puts "####################################"
-        puts "- Sending email to $maintainer_name:"
-        puts $out_email_contents
+        ;#puts "- Sending email to $maintainer_name:"
+        ;#puts $out_email_contents
 
         ;# Append an entry into the log file
         add_to_log "sent activity control email to $maintainer_email for 
packages $pkg_list_str"