[Commit-womb] gnumaint .cvsignore Makefile gnumaint testjunk1...

[Karl Berry]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Karl Berry <karl>       07/02/11 21:50:53

Modified files:
        .              : .cvsignore Makefile gnumaint 
Added files:
        .              : testjunk1.msg 

Log message:
        log more

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/.cvsignore?cvsroot=womb&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnumaint/Makefile?cvsroot=womb&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnumaint?cvsroot=womb&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnumaint/testjunk1.msg?cvsroot=womb&rev=1.1

Patches:
Index: .cvsignore
===================================================================
RCS file: /sources/womb/gnumaint/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- .cvsignore  4 Jan 2007 19:52:56 -0000       1.1
+++ .cvsignore  11 Feb 2007 21:50:53 -0000      1.2
@@ -1 +1,3 @@
+activity-report.txt
+discarded-email.txt
 gnumaint.log

Index: Makefile
===================================================================
RCS file: /sources/womb/gnumaint/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Makefile    25 Jan 2007 17:40:29 -0000      1.5
+++ Makefile    11 Feb 2007 21:50:53 -0000      1.6
@@ -4,9 +4,9 @@
 # are permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved.
 
-test-maint-convert:
-#      maintfileupgrade $(gorg)/maintainers | dos2unix
-       maintfileupgrade m.src | dos2unix | tee m.new
+test-rece:
+#      gnumaint recemail </etc/issue
+       gnumaint recemail <testjunk1.msg
 
 sep = 2>&1 | dos2unix; true ------------------------------
 
@@ -28,3 +28,7 @@
        gnumaint help sendemail $(sep)
        gnumaint help list $(sep)
        gnumaint help $(sep)
+
+test-maint-convert:
+#      maintfileupgrade $(gorg)/maintainers | dos2unix
+       maintfileupgrade m.src | dos2unix | tee m.new

Index: gnumaint
===================================================================
RCS file: /sources/womb/gnumaint/gnumaint,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gnumaint    25 Jan 2007 13:37:13 -0000      1.21
+++ gnumaint    11 Feb 2007 21:50:53 -0000      1.22
@@ -1,8 +1,7 @@
 #!/usr/bin/env tclsh
-#
 # gnumaint - GNU maintainers file maintenance (/gd/gnuorg/maintainers)
 #
-# Copyright (C) 2007 Free Software Foundation Inc.
+# Copyright 2007 Free Software Foundation Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,16 +21,16 @@
 
 # Global variables (configuration section)
 
-variable maintainers_file     "maintainers.new"
+variable maintainers_file     "maintainers"
 variable mailtemplate_active  "template-active.txt"
+variable log_file             "gnumaint.log"
+variable report_file          "activity-report.txt"
+variable discarded_email      "discarded-email.txt"
 variable formail              "/usr/bin/formail"
 variable sendmail             "/usr/sbin/sendmail"
-variable log_file             "gnumaint.log"
+variable lockfile_command     "/usr/bin/lockfile"
 variable email_originator     "address@hidden"
 variable email_reply          "address@hidden"
-variable lockfile_command     "/usr/bin/lockfile"
-variable report_file          "activity-report"
-variable discarded_email      "discarded-email"
 
 proc do_help_usage {} {
   global maintainers_file
@@ -313,20 +312,22 @@
             }
             if {!$maintainer_found} then {
                 ;# Maintainer not found => discard email
+                add_to_log "discarded mail from unknown maintainer 
$maintainer_email"
                 discard_email $email_contents
                 return
             }
 
             ;# Log the operation
-            add_to_log \
-                "received activity control email reply from $maintainer_email"
+            add_to_log "received activity reply from $maintainer_email"
 
             ;# Annotate this packages into the activity file
             activity_annotate $maintainer_email
 
         }
        default {
-           ;# Unknown email type. Ignore it.
+           ;# Unknown email type. Discard it.
+            add_to_log "discarded strange email from $from about $subject"
+            discard_email $email_contents
        }
     }
 }
@@ -786,6 +787,10 @@
 }
 
 proc main {} {
+#    regexp {(.*)/[^/]*$)} $argv0 mydir
+#    puts $mydir
+#    cd $mydir
+    
     variable maintainersdb
     
     # Override configuration variables from

Index: testjunk1.msg
===================================================================
RCS file: testjunk1.msg
diff -N testjunk1.msg
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testjunk1.msg       11 Feb 2007 21:50:53 -0000      1.1
@@ -0,0 +1,15 @@
+From address@hidden Sun Feb 11 14:48:08 2007
+Return-path: <address@hidden>
+Envelope-to: address@hidden
+Delivery-date: Sun, 11 Feb 2007 14:48:08 -0500
+Received: from karl by fencepost.gnu.org with local (Exim 4.60)
+       (envelope-from <address@hidden>)
+       id 1HGKgC-0000P9-M8
+       for address@hidden; Sun, 11 Feb 2007 14:48:08 -0500
+To: address@hidden
+Message-Id: <address@hidden>
+From: Karl Berry <address@hidden>
+Date: Sun, 11 Feb 2007 14:48:08 -0500
+
+karl fencepost Sun Feb 11 14:48:08 EST 2007
+