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

diff --git a/bugscan b/bugscan
index 7b76b6e..555eb4c 100755
--- a/bugscan
+++ b/bugscan
@@ -1,38 +1,52 @@
 #! /usr/bin/perl
 
-require bugcfg;
-require scanlib;
+use warnings;
 use strict;
-# use warnings;
+
+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}\n";
-	for my $b (@{$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;