[commit-womb] gnumaint gm

[Karl Berry]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Karl Berry <karl>       09/03/06 19:33:26

Modified files:
        .              : gm 

Log message:
        consistently return a list instead of directly printing

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

Patches:
Index: gm
===================================================================
RCS file: /sources/womb/gnumaint/gm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gm  5 Mar 2009 17:34:03 -0000       1.13
+++ gm  6 Mar 2009 19:33:25 -0000       1.14
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: gm,v 1.13 2009/03/05 17:34:03 karl Exp $
+# $Id: gm,v 1.14 2009/03/06 19:33:25 karl Exp $
 # More gnumaint-related stuff, since I think better in Perl than TCL.
 # 
 # Copyright 2007, 2008, 2009 Free Software Foundation Inc.
@@ -38,9 +38,10 @@
 Usage: $0 CMD ARG...
 
 Here are the possibilities:
+list maintainers nophysical  (maintainers without phone/address info)
+list packages activity       (packages sorted by activity-status)
 list packages bymaintainer   (generate the maintainers.bypkg file)
 list packages unanswered     (packages which we've had no contact about)
-list maintainers nophysical  (maintainers without phone/address info)
 check activityfile           (verify activity-report.txt)
 check gnupackages            (verify consistency with maintainers file)
 
@@ -61,6 +62,15 @@
 
 
 
+# Return all packages sorted by activity status, one package per line.
+# 
+sub list_packages_activity
+{
+  my @ret = ();
+}
+
+
+
 # Return all packages with all their maintainers, one maintainer per
 # line, like the original format of the maintainers file.  We run this
 # from cron.
@@ -169,10 +179,13 @@
 
 
 
-# Report any package in the activity report is in the maintainers file.
+# Return list of packages in the activity report that is not in the
+# maintainers file.
 # 
 sub check_activityfile_
 {
+  my @ret = ();
+
   # most of these have been decommissioned, a few renamed or merged.
   # but it seems good to preserve the original activity info,
   # so special-case that they are ok.
@@ -205,13 +218,13 @@
     next if $ap eq "*";  # our last_sendemail placeholder
     my ($email,$name,$time,$line) = split (/\|/, $activity{$ap});
     
-    print "$ACTIVITY_FILE:$line: active package $ap does not exist"
-          . " ($email|$name|$time)\n"
+    push (@ret, "$ACTIVITY_FILE:$line: active package $ap does not exist"
+                . " ($email|$name|$time)")
       unless exists $pkgs{$ap} || exists $missing_pkg_ok{$ap};
     
   }
   
-  return ();
+  return @ret;
   
   sub by_lineno
   {
@@ -223,11 +236,13 @@
 
 
 
-# Report any package in the extra gnupackages.text file that is not in the
+# Return list of packages in the gnupackages file that are not in the
 # maintainers file, and vice versa.
 # 
 sub check_gnupackages_
 {
+  my @ret = ();
+  
   my %maint_file = &read_maintainers ("by-package");
   my %pkg_file = &read_gnupackages ();
   
@@ -239,13 +254,17 @@
   }
   
   for my $p (sort keys %pkg_file) {
-    print "$GNUPACKAGES_FILE:$pkg_file{$p}->{lineno}: $p not in maintainers\n";
+    push (@ret, "$GNUPACKAGES_FILE:$pkg_file{$p}->{lineno}: "
+                . "$p not in maintainers");
   }
   
   for my $p (sort keys %maint_file) {
     next if $p =~ /\.nongnu/;
-    print "$MAINTAINERS_FILE:$maint_file{$p}[0]->{lineno}: $p not in 
gnupackages\n";
+    push (@ret, "$MAINTAINERS_FILE:$maint_file{$p}[0]->{lineno}: "
+                . "$p not in gnupackages");
   }
+  
+  return @ret;
 }