* Move code from bugreport.cgi to Debbugs::CGI::Bugreport

[debbugs.git] / Debbugs / Common.pm

diff --git a/Debbugs/Common.pm b/Debbugs/Common.pm
index 4f36cb1c5f27e05d8891e433e833124ff0860065..8d837291274afee68326b54a2ca1cab4b98364ce 100644 (file)
--- a/Debbugs/Common.pm
+++ b/Debbugs/Common.pm
@@ -40,7 +40,8 @@ BEGIN{
      @EXPORT = ();
      %EXPORT_TAGS = (util   => [qw(getbugcomponent getbuglocation getlocationpath get_hashname),
                                qw(appendfile buglog getparsedaddrs getmaintainers),
-                               qw(getmaintainers_reverse)
+                               qw(getmaintainers_reverse),
+                               qw(getpseudodesc),
                               ],
                     misc   => [qw(make_list)],
                     date   => [qw(secs_to_english)],
@@ -205,7 +206,11 @@ sub getparsedaddrs {
     return () unless defined $addr;
     return wantarray?@{$_parsedaddrs{$addr}}:$_parsedaddrs{$addr}[0]
         if exists $_parsedaddrs{$addr};
-    @{$_parsedaddrs{$addr}} = Mail::Address->parse($addr);
+    {
+        # don't display the warnings from Mail::Address->parse
+        local $SIG{__WARN__} = sub { };
+        @{$_parsedaddrs{$addr}} = Mail::Address->parse($addr);
+    }
     return wantarray?@{$_parsedaddrs{$addr}}:$_parsedaddrs{$addr}[0];
 }
 
@@ -215,7 +220,7 @@ sub getmaintainers {
     return $_maintainer if $_maintainer;
     my %maintainer;
     my %maintainer_rev;
-    for my $file (@config{qw(maintainer_file maintainer_file_override)}) {
+    for my $file (@config{qw(maintainer_file maintainer_file_override pseduo_maint_file)}) {
         next unless defined $file;
         my $maintfile = new IO::File $file,'r' or
              &quitcgi("Unable to open $file: $!");
@@ -240,6 +245,40 @@ sub getmaintainers_reverse{
      return $_maintainer_rev;
 }
 
+=head2 getpseudodesc
+
+     my $pseudopkgdesc = getpseudodesc(...);
+
+Returns the entry for a pseudo package from the
+$config{pseudo_desc_file}. In cases where pseudo_desc_file is not
+defined, returns an empty arrayref.
+
+This function can be used to see if a particular package is a
+pseudopackage or not.
+
+=cut
+
+our $_pseudodesc;
+sub getpseudodesc {
+    return $_pseudodesc if $_pseudodesc;
+    my %pseudodesc;
+
+    if (not defined $config{pseudo_desc_file}) {
+        $_pseudodesc = {};
+        return $_pseudodesc;
+    }
+    my $pseudo = IO::File->new($config{pseudo_desc_file},'r')
+        or die "Unable to open $config{pseudo_desc_file}: $!";
+    while(<$pseudo>) {
+       next unless m/^(\S+)\s+(\S.*\S)\s*$/;
+       $pseudodesc{lc $1} = $2;
+    }
+    close($pseudo);
+    $_pseudodesc = \%pseudodesc;
+    return $_pseudodesc;
+}
+
+
 =head1 DATE
 
     my $english = secs_to_english($seconds);
@@ -367,7 +406,7 @@ sub lockpid {
          unlink $pidfile or
               die "Unable to unlink stale pidfile $pidfile $!";
      }
-     my $pidfh = IO::File->new($pidfile), 'w' or
+     my $pidfh = IO::File->new($pidfile,'w') or
          die "Unable to open $pidfile for writing: $!";
      print {$pidfh} $$ or die "Unable to write to $pidfile $!";
      close $pidfh or die "Unable to close $pidfile $!";
@@ -391,7 +430,7 @@ instead. (Or possibly a die handler, if the cleanups are important)
 =cut
 
 sub quit {
-    print $DEBUG_FH "quitting >$_[0]<\n" if $DEBUG;
+    print {$DEBUG_FH} "quitting >$_[0]<\n" if $DEBUG;
     my ($u);
     while ($u= $cleanups[$#cleanups]) { &$u; }
     die "*** $_[0]\n";