[Commit-womb] gnumaint gnumaint

[Karl Berry]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Karl Berry <karl>       06/12/28 20:02:19

Modified files:
        .              : gnumaint 

Log message:
        work on help messages

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

Patches:
Index: gnumaint
===================================================================
RCS file: /sources/womb/gnumaint/gnumaint,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnumaint    28 Dec 2006 19:34:21 -0000      1.8
+++ gnumaint    28 Dec 2006 20:02:19 -0000      1.9
@@ -20,9 +20,7 @@
 #
 # Originally written by Jose Marchesi.
 
-##
 ## Global variables (configuration section)
-##
 
 variable maintainers_file "maintainers.new"
 variable mail_activity    "mailtestforactivity.txt"
@@ -33,6 +31,30 @@
 variable email_reply      "address@hidden"
 variable lockfile_command "/usr/bin/lockfile"
 
+proc do_help_usage {} {
+  global maintainers_file
+  global mail_activity
+
+  puts "Usage: gnumaint OPERATION \[ARG\]..."
+  puts ""
+  puts "Manage GNU maintainer information."
+  puts ""
+  puts "Available OPERATIONs:"
+  puts "   list - retrieve information"
+  puts "   sendemail - send email to maintainers"
+  puts "   recemail - receive email from maintainers"
+  puts ""
+  puts "For more help, run:"
+  puts "   gnumaint help OPERATION"
+  puts ""
+  puts "The maintainer information is taken from the file"
+  puts "  $maintainers_file (GNUMAINT_MAINTAINERS_FILE envvar overrides)."
+  puts "The mail activity is recorded in the file"
+  puts "  $mail_activity (GNUMAINT_MAIL_ACTIVITY envvar overrides)."
+  puts ""
+  puts "Please use the address@hidden address for any discussion."
+}
+
 # Maintainers database structure:
 #
 #   { {MAINTAINER-NAME MAINTAINER-EMAIL MAINTAINER-NOTES {PACKAGE1 PACKAGE2 
...}} ...}
@@ -40,7 +62,6 @@
 set maintainersdb {}
 
 proc add_to_log {text} {
-
     variable logfile
 
     set flog [open $logfile a]
@@ -48,23 +69,6 @@
     close $flog
 }
 
-proc do_help_usage {} {
-    
-    puts {Usage: gnumaint OPERATION [ARG]...}
-    puts "Perform several operations to manage GNU maintainers related 
information"
-    puts {}
-    puts "Available operations are:"
-    puts {}
-    puts "   sendemail"
-    puts "   recemail"
-    puts "   list"
-    puts {}
-    puts "For detailed help and usage of the operations, use the help 
operation as:"
-    puts {}
-    puts "   gnumaint help OPERATION"
-    puts {}
-}
-
 proc get_entry_value {entry text} {
 
     set label_regexp "${entry}:"
@@ -233,34 +237,24 @@
 }
 
 proc do_help_list {} {
-
-    puts "gnumaint list - list information about GNU maintainers on the screen"
-    puts "Usage:"
-    puts {}
-    puts "  gnumaint list TOPIC \[ARGS\]..."
-    puts {}
-    puts "Allowed TOPICs are:"
-    puts {}
-    puts "  packages \[ARG\] - list the names of GNU packages"
-    puts "     all (or no argument)"
-    puts "       list all packages"
-    puts "     maintained"
-    puts "       list all maintained packages"
-    puts "     unmaintained"
-    puts "       list all unmaintained packages"
-    puts "     maintainer MAINTAINER"
-    puts "       list all packages maintained by MAINTAINER (search is done in 
both names and emails)"
-    puts "  maintainers \[ARG\] - list information about GNU maintainers"
-    puts "     all (or no argument)"
-    puts "       list all maintainers"
-    puts "     package PACKAGE-NAME"
-    puts "       list the maintainers of PACKAGE-NAME (search is done for 
\"*PACKAGE-NAME*\")"
-    puts "       note that this search is case-insensitive"
-    puts "     OTHER"
-    puts "       search for GLOB in maintainers info"
-
-
-    puts {}
+    puts "Usage: gnumaint list TOPIC \[ARG\]..."
+    puts ""
+    puts "List information about GNU maintainers to stdout."
+    puts ""
+    puts "Allowed TOPICs:"
+    puts "  packages \[ARG\]"
+    puts "    all \[or no argument\] - list all packages"
+    puts "    maintained - list all maintained packages"
+    puts "    unmaintained - list all unmaintained packages"
+    puts "    maintainer MAINTAINER - list MAINTAINER's packages"
+    puts "      (search is done in both names and email addresses)"
+    puts ""
+    puts "  maintainers \[ARG\]"
+    puts "    all \[or no argument\] - list all maintainers"
+    puts "    package PACKAGE - list maintainers of PACKAGE"
+    puts "      search is done for \"*PACKAGE*\", case-insensitive"
+    puts "    GLOB"
+    puts "      search for GLOB in maintainers file"
 }
 
 proc do_help_sendemail {} {
@@ -507,7 +501,6 @@
     }
 
     switch [lindex $opargs 1] {
-
        packages {
            
            if {[llength $opargs] == 2} then {
@@ -530,15 +523,13 @@
                         do_list_packages_maintainer [lindex $opargs 3]
                     }
                    default {
-                       do_help_list
+                       puts "Unknown list packages operation: [lindex $opargs 
2]"
                    }
                }
            }
        }
        maintainers {
-
            if {[llength $opargs] == 2} then {
-               
                do_list_maintainers all
 
            } else {
@@ -551,15 +542,18 @@
                         do_list_package_maintainers [lindex $opargs 3]
                     }
                     default {
-                        
                         do_list_maintainers [lindex $opargs 2]
                     }
                 }
             }
        }
-       default {
 
+       help {
            do_help_list
+       }
+       
+       default {
+           puts "Unknown list operation: [lindex $opargs 1]"
            exit 1
        }
     }
@@ -747,7 +741,6 @@
 # Call the main routine
 main
 
-
 # Local Variables:
 # mode: tcl
 # End: