From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Mon, 6 Feb 2006 01:39:49 +0000 (+0000)
Subject: Fix non-US handling
X-Git-Tag: switch-to-templates~166
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=4049e331db0eba40193f0ec30f8e68bb020595a4;p=deb%2Fpackages.git

Fix non-US handling
Fix handling of packages without source package
---

diff --git a/cgi-bin/show_package.pl b/cgi-bin/show_package.pl
index a98337a..1a29b39 100755
--- a/cgi-bin/show_package.pl
+++ b/cgi-bin/show_package.pl
@@ -83,7 +83,7 @@ my %params_def = ( package => { default => undef, match => '^([a-z0-9.+-]+)$',
 			      var => \$suite },
 		   archive => { default => 'all', match => '^(\w+)$',
 				array => ',', var => \@archives,
-				replace => { all => [qw(us security)] } },
+				replace => { all => [qw(us security non-US)] } },
 		   section => { default => 'all', match => '^(\w+)$',
 				array => ',', var => \@sections,
 				replace => { all => \@SECTIONS } },
@@ -170,6 +170,7 @@ unless (@Packages::CGI::fatal_errors) {
 	    my $source = $page->get_newest( 'source' );
 	    my $source_version = $page->get_newest( 'source-version' )
 		|| $version;
+	    debug( "find source package: source=$source (=$source_version)", 1);
 	    my $src_data = $sources_all{"$source $source_version"};
 	    unless ($src_data) { #fucking binNMUs
 		my $versions = $page->get_versions;
@@ -184,7 +185,8 @@ unless (@Packages::CGI::fatal_errors) {
 		}
 		error( "couldn't find source package" ) unless $src_data;
 	    }
-	    $page->add_src_data( $source, $source_version, $src_data );
+	    $page->add_src_data( $source, $source_version, $src_data )
+		if $src_data;
 
 	    my $st1 = new Benchmark;
 	    my $std = timediff($st1, $st0);
@@ -222,7 +224,7 @@ unless (@Packages::CGI::fatal_errors) {
 	    foreach (@results, @non_results) {
 		my $a = $_->[1];
 		my $s = $_->[2];
-		if ($a =~ /^(?:us|security)$/o) {
+		if ($a =~ /^(?:us|security|non-US)$/o) {
 		    $all_suites{$s}++;
 		} else {
 		    $all_suites{"$s/$a"}++;
@@ -251,6 +253,8 @@ unless (@Packages::CGI::fatal_errors) {
 
  	    my $title .= sprintf( gettext( "Package: %s (%s)" ), $pkg, $v_str );
  	    $title .=  " ".marker( $archive ) if $archive ne 'us';
+ 	    $title .=  " ".marker( $subsection ) if $subsection eq 'non-US'
+		and $archive ne 'non-US'; # non-US/security
  	    $title .=  " ".marker( $section ) if $section ne 'main';
  	    $package_page .= title( $title );