[commit-womb] gnumaint gm-generate.pl gm-read.pl gm-util.pl

[Brandon Invergo]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Brandon Invergo <brandon>       18/11/12 17:18:58

Modified files:
        .              : gm-generate.pl gm-read.pl gm-util.pl 

Log message:
        When generating maintainers.bypkg from maintainers, put named uploaders 
in their own line for the packages that have them.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-generate.pl?cvsroot=womb&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-read.pl?cvsroot=womb&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-util.pl?cvsroot=womb&r1=1.7&r2=1.8

Patches:
Index: gm-generate.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-generate.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gm-generate.pl      9 Mar 2014 22:11:09 -0000       1.18
+++ gm-generate.pl      12 Nov 2018 22:18:57 -0000      1.19
@@ -1,4 +1,4 @@
-# $Id: gm-generate.pl,v 1.18 2014/03/09 22:11:09 karl Exp $
+# $Id: gm-generate.pl,v 1.19 2018/11/12 22:18:57 brandon Exp $
 # The generate actions for the gm script (see --help message).
 # 
 # Copyright 2007, 2008, 2009, 2010, 2012, 2013, 2014
@@ -57,7 +57,7 @@
   my %pkgs = &read_maintainers ("by-package");
   
   for my $p (sort { lc($a) cmp lc($b) } keys %pkgs) {
-    my ($entries,$generic_entry) = &maintainer_email_addrs ($pkgs{$p});
+    my ($entries,$generic_entry,$uploaders) = &maintainer_email_addrs 
($pkgs{$p});
     
     # might not be anything in @entries if the only maintainer was generic.
     push (@ret, "$p - $entries") if $entries;
@@ -65,6 +65,10 @@
     # if we had a generic maintainer for this package, add that as a
     # separate entry, since that's the way rms wants it.
     push (@ret, "$p (generic) - $generic_entry") if $generic_entry;
+
+    # if there are named uploaders (distinct from maintainers), add
+    # them under a separate entry
+    push (@ret, "$p (uploaders) - $uploaders") if $uploaders;
   }
   
   return @ret;

Index: gm-read.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-read.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gm-read.pl  15 Sep 2017 00:45:50 -0000      1.21
+++ gm-read.pl  12 Nov 2018 22:18:57 -0000      1.22
@@ -1,4 +1,4 @@
-# $Id: gm-read.pl,v 1.21 2017/09/15 00:45:50 jmd Exp $
+# $Id: gm-read.pl,v 1.22 2018/11/12 22:18:57 brandon Exp $
 # Subroutines for gm script that read various external data file.
 # 
 # Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
@@ -679,16 +679,25 @@
       
       if ($how eq "by-package") {
         # split apart the package value we've accumulated..
-        if (exists $maint{"package"}) {
+        if (exists $maint{"package"} || exists $maint{"uploader"}) {
           my @pkgs = split (/\|/, $maint{"package"});
+         my @uplds = split (/\|/, $maint{"uploader"});
 
           # append this maintainer to the list for each of his/her packages.
           my %copy = %maint;
+         $copy{"is_uploader"} = 0;
           for my $p (@pkgs) {
             my @x = exists $ret{$p} ? @{$ret{$p}} : ();
             push (@x, \%copy);
             $ret{$p} = address@hidden;
           }
+         my %copy2 = %maint;
+         $copy2{"is_uploader"} = 1;
+          for my $p (@uplds) {
+            my @x = exists $ret{$p} ? @{$ret{$p}} : ();
+            push (@x, \%copy2);
+            $ret{$p} = address@hidden;
+          }
         } else {
           warn "no packages for $maint{name}";
         }

Index: gm-util.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-util.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gm-util.pl  12 Mar 2015 22:35:12 -0000      1.7
+++ gm-util.pl  12 Nov 2018 22:18:57 -0000      1.8
@@ -1,4 +1,4 @@
-# $Id: gm-util.pl,v 1.7 2015/03/12 22:35:12 karl Exp $
+# $Id: gm-util.pl,v 1.8 2018/11/12 22:18:57 brandon Exp $
 # Utilities for the gm script.
 # 
 # Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013
@@ -30,6 +30,7 @@
   
   my @entries = ();
   my $generic_entry = "";
+  my @uploaders = ();
 
   for my $m (@{$pkgref}) {
     my $name = $m->{"name"};
@@ -50,6 +51,8 @@
       warn "two generic maintainers?! -- $entry and $generic_entry"
         if $generic_entry;
       $generic_entry = $entry;
+    } elsif ($m->{"is_uploader"}){
+       push (@uploaders, $entry);
     } else {
       push (@entries, $entry);
     }
@@ -57,8 +60,9 @@
   
   # Make the individuals into a comma-separated list.
   my $entries = join (", ", @entries);
+  my $uploaders = join (", ", @uploaders);
   
-  return ($entries,$generic_entry);
+  return ($entries,$generic_entry,$uploaders);
 }