X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugscan;h=e4cdfd3468a57b088f31cf2430e4edabfb8948db;hp=c78573f1576eddfc4f20733197cbd438c298c925;hb=bb49c3a5ba815ae3736b4533a9c9dc185c92ebdd;hpb=038c6aa61e809657e74971f8fe72a56fe57551a7

diff --git a/bugscan b/bugscan
index c78573f..e4cdfd3 100755
--- a/bugscan
+++ b/bugscan
@@ -3,36 +3,47 @@
 require bugcfg;
 require scanlib;
 use strict;
-use warnings;
+# use warnings;
 
 # 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";
+	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;