Add non-free-firmware to the valid sections

[bugscan.git] / bugscan

diff --git a/bugscan b/bugscan
index 5a297737149f3ff80c6f7694515c0b1fe0833650..555eb4c6ef6232d3c542ecbe12e45b648e408940 100755 (executable)
--- a/bugscan
+++ b/bugscan
@@ -1,37 +1,52 @@
 #! /usr/bin/perl
 
-require bugcfg;
-require scanlib;
-use strict;
 use warnings;
+use strict;
+
+use File::Basename;
+use lib dirname(__FILE__);
+use bugcfg;
+use scanlib;
 
 # Main part
 
 scanlib::readpackages($bugcfg::debian_ftproot, "debian") if defined $bugcfg::debian_ftproot;
-scanlib::readpackages($bugcfg::nonUS_ftproot, "non-US")  if defined $bugcfg::nonUS_ftproot;
 scanlib::readsources($bugcfg::debian_ftproot, "debian")  if defined $bugcfg::debian_ftproot;
-scanlib::readsources($bugcfg::nonUS_ftproot, "non-US")   if defined $bugcfg::nonUS_ftproot;
 
 scanlib::readdebbugssources($bugcfg::debian_sources, "debian") if defined $bugcfg::debian_sources;
-scanlib::readdebbugssources($bugcfg::nonUS_sources, "non-US") if defined $bugcfg::nonUS_sources;
 
 
 scanlib::readpseudopackages();
 scanlib::readmaintainers();
 scanlib::scanspool();
 
+binmode(STDOUT,':encoding(UTF-8)');
+
 for my $p (keys %scanlib::packagelist) {
        my $section;
-       if (exists $scanlib::section{$p}) {
-           $section = $scanlib::section{$p};
+       my $package = $p;
+       $package =~ s/src://;
+       if (exists $scanlib::section{$package}) {
+           $section = $scanlib::section{$package};
        } else {
-           $section = $scanlib::debbugssection{$p};
+           $section = $scanlib::debbugssection{$package};
        }
-       print "$p $section $scanlib::maintainer{$p}";
-       for my $b (split(/ /, $scanlib::packagelist{$p})) {
-               print "$scanlib::bugs{$b}\n";
+       print "package\n";
+       print $p, "\n";
+       print $section, "\n" if defined $section;
+       print $scanlib::maintainer{$package}, "\n";
+       print "\n";
+}
+
+for my $b (keys %scanlib::bugs) {
+       print "bug\n";
+       for my $key (keys %{$scanlib::bugs{$b}}) {
+               print $key, "=", $scanlib::bugs{$b}->{$key}, "\n";
        }
+       print "\n";
 }
 
+print "end\n";
+
 exit 0;