[commit-womb] gnumaint gm

[Karl Berry]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Karl Berry <karl>       08/02/19 15:00:47

Modified files:
        .              : gm 

Log message:
        (unanswered) show maintainers

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

Patches:
Index: gm
===================================================================
RCS file: /sources/womb/gnumaint/gm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gm  17 Feb 2008 15:07:44 -0000      1.10
+++ gm  19 Feb 2008 15:00:47 -0000      1.11
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: gm,v 1.10 2008/02/17 15:07:44 karl Exp $
+# $Id: gm,v 1.11 2008/02/19 15:00:47 karl Exp $
 # More gnumaint-related stuff, since I think better in Perl than TCL.
 # 
 # Copyright 2007, 2008 Free Software Foundation Inc.
@@ -77,13 +77,7 @@
       my $name = $m->{"name"};
       my $entry = $name;
       $entry .= " " if $entry;
-      if (exists $m->{"privateemail"}) {
-        # prefer private email addresses when we need to communicate.
-        $entry .= "<$m->{privateemail}>";
-      } else {
-        $entry .= "<$m->{email}>" if exists $m->{"email"};
-      }
-
+      $entry .= "<$m->{best_email}>" if exists $m->{"best_email"};
 
       if ($m->{"is_generic"} && $name ne "unmaintained") {
         # Assume that if a name starts with a lowercase letter, it is
@@ -119,7 +113,7 @@
   my @recentrel = &read_recentrel ();
   my %activity = &read_activity ("by-package");
   my %pkgs = &read_maintainers ("by-package");
-  my @pkgs = ();
+  my @ret = ();
 
   for my $p (sort { lc($a) cmp lc($b) } keys %pkgs) {
     #&debug_hash ($p, $pkgs{$p});
@@ -131,17 +125,23 @@
       # xx must check back to some cutoff, eventually
       &debug ("$p got activity reply, skipping");
 
-    } elsif ($pkgs{$p}[0]->{"name"} eq "unmaintained") {
-      # xx have to only check back to a certain date eventually
-      &debug ("$p unmaintained, skipping");
-
     } else {
       &debug ("$p no activity, returning");
-      push (@pkgs, $p);
+      my @entries = ();
+      for my $m (@{$pkgs{$p}}) {
+        next if $m->{"is_generic"};
+        my $entry = $m->{"name"};
+        $entry .= " " if $entry;
+        $entry .= "<$m->{best_email}>" if exists $m->{"best_email"};
+        push (@entries, $entry);
+      }
+    
+      # might not be anything in @entries.
+      push (@ret, "$p - " . join (", ", @entries)) if @entries;
     }
   }
   
-  return @pkgs;
+  return @ret;
 }