X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugscan;h=555eb4c6ef6232d3c542ecbe12e45b648e408940;hp=c6b077868065e0f20b06d9f54d7437240b803838;hb=HEAD;hpb=d5a0b74a3ddd8ad47fb594e890dfd0f454627655;ds=sidebyside

diff --git a/bugscan b/bugscan
index c6b0778..555eb4c 100755
--- a/bugscan
+++ b/bugscan
@@ -1,35 +1,52 @@
 #! /usr/bin/perl
 
-require bugcfg;
-require scanlib;
+use warnings;
+use strict;
+
+use File::Basename;
+use lib dirname(__FILE__);
+use bugcfg;
+use scanlib;
 
 # Main part
 
-&readpackages($debian_ftproot, "debian") if defined $debian_ftproot;
-&readpackages($nonUS_ftproot, "non-US")  if defined $nonUS_ftproot;
-&readsources($debian_ftproot, "debian")  if defined $debian_ftproot;
-&readsources($nonUS_ftproot, "non-US")   if defined $nonUS_ftproot;
+scanlib::readpackages($bugcfg::debian_ftproot, "debian") if defined $bugcfg::debian_ftproot;
+scanlib::readsources($bugcfg::debian_ftproot, "debian")  if defined $bugcfg::debian_ftproot;
+
+scanlib::readdebbugssources($bugcfg::debian_sources, "debian") if defined $bugcfg::debian_sources;
 
-&readdebbugssources($debian_sources, "debian") if defined $debian_sources;
-&readdebbugssources($nonUS_sources, "non-US") if defined $nonUS_sources;
 
+scanlib::readpseudopackages();
+scanlib::readmaintainers();
+scanlib::scanspool();
 
-&readpseudopackages;
-&readmaintainers;
-&scanspool;
+binmode(STDOUT,':encoding(UTF-8)');
 
-for $p (keys %packagelist) {
+for my $p (keys %scanlib::packagelist) {
 	my $section;
-	if (exists $section{$p}) {
-	    $section = $section{$p};
+	my $package = $p;
+	$package =~ s/src://;
+	if (exists $scanlib::section{$package}) {
+	    $section = $scanlib::section{$package};
 	} else {
-	    $section = $debbugssection{$p};
+	    $section = $scanlib::debbugssection{$package};
 	}
-	print "$p $section $maintainer{$p}";
-	for $b (split(/ /, $packagelist{$p})) {
-		print "$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;