commit-womb
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-womb] gnumaint gnumaint


From: Karl Berry
Subject: [Commit-womb] gnumaint gnumaint
Date: Sun, 11 Feb 2007 23:44:46 +0000

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Karl Berry <karl>       07/02/11 23:44:46

Modified files:
        .              : gnumaint 

Log message:
        formatting

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

Patches:
Index: gnumaint
===================================================================
RCS file: /sources/womb/gnumaint/gnumaint,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gnumaint    11 Feb 2007 23:37:08 -0000      1.23
+++ gnumaint    11 Feb 2007 23:44:46 -0000      1.24
@@ -91,9 +91,9 @@
 proc do_help_recemail {} {
   puts "gnumaint recemail - receive an email from a maintainer"
   puts "Usage:"
-  puts {}
+  puts ""
   puts "  gnumaint recemail"
-  puts {}
+  puts ""
 }
 
 proc do_help_operation {topic} {
@@ -116,7 +116,6 @@
 
 proc add_to_log {text} {
     global log_file
-
     set flog [open $log_file a]
     puts $flog "[exec date]: $text"
     close $flog
@@ -130,35 +129,28 @@
 set maintainersdb {}
 
 proc get_entry_value {entry text} {
-
     set label_regexp "${entry}:"
     set entry_regexp "^${label_regexp}(.+)"
 
     regexp $entry_regexp $text match entry_content
 
     return [string trim $entry_content]
-
 }
 
 proc get_entry_label {text} {
-
     set entry_regexp "^(.+):.+"
 
     regexp $entry_regexp $text match entry_label
 
     ;# Bad formed entry line
     if {![info exist entry_label]} then {
-
        return {}
-
     }
 
     return [string trim $entry_label]
-
 }
 
 proc parse_maintainers {finput lineno} {
-    
     global maintainers_file
     global maintainersdb
 
@@ -168,19 +160,14 @@
     }
 
     while {(![eof $finput]) && ([string index $line 0] != "\f")} {
-
        # Break if EOF or ^L
        if {[eof $finput] || ([string index $line 0] == "\f")} then {
-
            break;
-
        }
 
         ;# Skip blank lines
        while {$line == ""} {
-
            gets $finput line
-
        }
 
         ;# Process this maintainer entry
@@ -190,11 +177,9 @@
         set maintainer_packages {}
 
         if {[string match "name:*" $line]} then {
-
            set maintainer_name [get_entry_value name $line]
 
        } else {
-
            puts "parse error: $maintainers_file \[line $lineno\]: `name:' 
expected" 
            exit 1
        }
@@ -203,25 +188,18 @@
        incr lineno
         
         while {$line != ""} {
-
            set entry_label [get_entry_label $line]
-
            switch $entry_label {
-               
                "email" {
-
                    set maintainer_email [get_entry_value email $line]
                }
                "note" {
-
                    set note_contents [get_entry_value note $line]
                    lappend maintainer_notes $note_contents
                }
                "package" {
-
                    set pkgname [get_entry_value package $line]
                     lappend maintainer_packages $pkgname
-
                 }
             }
 
@@ -235,7 +213,6 @@
                                    $maintainer_email \
                                    $maintainer_notes \
                                    $maintainer_packages]
-
         ;# Read the next line
         gets $finput line
         incr lineno
@@ -243,21 +220,18 @@
 }
 
 proc build_maintainers_db {} {
-    
     global maintainers_file
     global maintainersdb
 
     # Open the maintainers file
     if {[catch {set finput [open $maintainers_file r]}]} {
-
        puts "Cannot open the maintainers file $maintainers_file"
        puts "Aborting"
        exit 1
     }
 
-    set lineno 0
-
     # Get the first line
+  set lineno 0
     gets $finput line
     incr lineno
 
@@ -275,8 +249,8 @@
     close $finput
 }
 
+# 
 proc do_recemail_operation {opargs} {
-
     variable maintainersdb
     variable formail
 
@@ -293,7 +267,6 @@
     set subject [string trim $subject]
 
     switch -glob $subject {
-
        "*GNU package maintenance*" {
            ;#
            ;# Activity response email
@@ -305,7 +278,6 @@
             ;# Make sure this maintainer exist on the dabase
             set maintainer_found false
             foreach maintainer $maintainersdb {
-
                 if {[lindex $maintainer 1] == $maintainer_email} then {
                     set maintainer_found true
                 }
@@ -322,7 +294,6 @@
 
             ;# Annotate this packages into the activity file
             activity_annotate $maintainer_email
-
         }
        default {
            ;# Unknown email type. Discard it.
@@ -333,30 +304,24 @@
 }
 
 proc discard_email {email_contents} {
-
     variable discarded_email
 
     set fout [open $discarded_email a]
-
     puts $fout $email_contents
-
     close $fout
 }
 
 proc sendemail_annotate {} {
-
     variable report_file
 
     set fout [open $report_file a]
-    
-    set line "last_sendemail : [timestamp]"
+  set line "last_sendemail: [timestamp]"
     puts $fout $line
     
     close $fout
 }
 
 proc activity_annotate {maintainer_email} {
-
     variable report_file
     variable maintainersdb
 
@@ -365,11 +330,8 @@
 
     ;# Collect information for this maintainer
     foreach maintainer $maintainersdb {
-
         if {[lindex $maintainer 1] == $maintainer_email} then {
-
             set maintainer_packages [lindex $maintainer 3]
-
             break;
         }
     }
@@ -378,9 +340,7 @@
     set fout [open $report_file a]
 
     foreach pkg $maintainer_packages {
-
         set pkgline "$pkg : $maintainer_email : [timestamp]"
-
         puts $fout $pkgline
     }
 
@@ -388,7 +348,6 @@
 }
 
 proc timestamp {} {
-
     return [clock format [clock seconds]]
 }
 
@@ -413,9 +372,7 @@
 }
 
 proc fill_template {translation_list email_template} {
-
     foreach trn $translation_list {
-       
        regsub -all -- [lindex $trn 0] $email_template [lindex $trn 1] 
email_template
     }
 
@@ -438,7 +395,6 @@
     close $email_contents_file
 
     foreach maintainer $maintainersdb {
-
         set maintainer_name [lindex $maintainer 0]
         set maintainer_email [lindex $maintainer 1]
         set maintainer_notes [lindex $maintainer 2]
@@ -539,7 +495,6 @@
 }
 
 proc do_list_operation {opargs} {
-
     if {[llength $opargs] == 1} then {
        do_help_list
        exit 1
@@ -547,14 +502,10 @@
 
     switch [lindex $opargs 1] {
        packages {
-           
            if {[llength $opargs] == 2} then {
-
                do_list_packages all
-
            } else {
                switch [lindex $opargs 2] {
-                   
                    all {
                        do_list_packages all
                    }
@@ -576,10 +527,8 @@
        maintainers {
            if {[llength $opargs] == 2} then {
                do_list_maintainers all
-
            } else {
                 switch [lindex $opargs 2] {
-               
                     all {
                         do_list_maintainers all
                     }
@@ -605,11 +554,9 @@
 }
 
 proc do_list_maintainers {which} {
-
     variable maintainersdb
 
     foreach maintainer $maintainersdb {
-        
         set maintainer_name [lindex $maintainer 0]
         set maintainer_email [lindex $maintainer 1]
         set maintainer_notes [lindex $maintainer 2]
@@ -634,11 +581,9 @@
 }
 
 proc do_list_package_maintainers {package_name} {
-
     variable maintainersdb
 
     foreach maintainer $maintainersdb {
-       
         set maintainer_name [lindex $maintainer 0]
         set maintainer_email [lindex $maintainer 1]
         set maintainer_notes [lindex $maintainer 2]
@@ -646,7 +591,6 @@
 
         set to_list false
         foreach pkg $maintainer_pkgs {
-
             if {[string match -nocase "*${package_name}*" $pkg]} then {
                 set to_list true
                 break
@@ -654,7 +598,6 @@
         }
 
         if {$to_list} then {
-
             ;# List this maintainer
             puts -nonewline $maintainer_name
             if {$maintainer_email != ""} then {
@@ -671,11 +614,9 @@
 }
 
 proc do_list_packages_maintainer {maintainer_info} {
-
     variable maintainersdb
 
     foreach maintainer $maintainersdb {
-
         set maintainer_name [lindex $maintainer 0]
         set maintainer_email [lindex $maintainer 1]
         set maintainer_pkgs [lindex $maintainer 3]
@@ -688,17 +629,13 @@
             }
         }
     }
-
 }
 
 proc do_list_packages {which} {
-
     variable maintainersdb
 
     set pkg_list {}
-
     foreach maintainer $maintainersdb {
-
         set maintainer_name [lindex $maintainer 0]
         set maintainer_pkgs [lindex $maintainer 3]
         
@@ -718,27 +655,21 @@
     }
 
     foreach pkg $pkg_list {
-
         puts $pkg
     }
 }
 
 proc parse_command_line_arguments {} {
-
     variable argc
     variable argv
 
     if {$argc == 0} then {
-       
        do_help_usage
        exit 1
-
     }
 
     switch [lindex $argv 0] {
-
        help {
-
            if {($argc == 1) || ($argc > 2)} then {
                do_help_usage
                exit 0
@@ -747,21 +678,16 @@
            exit 0
        }
        list {
-
            do_list_operation $argv
        }
        sendemail {
-
            do_sendemail_operation $argv
 
        }
        recemail {
-
            do_recemail_operation $argv
-
        }
        default {
-
            do_help_usage
            exit 1
        }
@@ -783,7 +709,6 @@
     if {[info exists env(GNUMAINT_MAILTEMPLATE_ACTIVE)]} then {
       set mailtemplate_active $env(GNUMAINT_MAILTEMPLATE_ACTIVE)
     }
-
 }
 
 proc main {} {
@@ -791,7 +716,6 @@
     global argv0
     variable mydir
     regsub {/[^/]*$} $argv0 "" mydir
-    puts $mydir
     cd $mydir
     
     variable maintainersdb




reply via email to

[Prev in Thread] Current Thread [Next in Thread]