X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=e18991a96e1d76fe7d5858fb8c59434dd4f37d5e;hb=642cb5a0cb13d9376c218b8c617623e7e0abfb7e;hp=3070f1b85f7f0de6feee0c1559f4304c5d36c516;hpb=3bb6c9d9922b0487901c02962b1d64c525f1bdd7;p=deb%2Fpackages.git
diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 3070f1b..e18991a 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -75,19 +75,13 @@ sub do_show {
foreach (@results, @non_results) {
my $a = $_->[1];
my $s = $_->[2];
- if ($a =~ /^(?:us|security|non-US)$/o) {
- $all_suites{$s}++;
- } else {
- $all_suites{"$s/$a"}++;
- }
+ $all_suites{$s}++;
}
foreach (suites_sort(keys %all_suites)) {
- if (("$suite/$archive" eq $_)
- || (!$all_suites{"$suite/$archive"} && ($suite eq $_))) {
+ if ($suite eq $_) {
$$menu .= "[ $_ ] ";
} else {
- $$menu .=
- "[ $_ ] ";
+ $$menu .= "[ $_ ] ";
}
}
$$menu .= '
';
@@ -97,7 +91,7 @@ sub do_show {
} else {
unless ($opts->{source}) {
for my $entry (@results) {
- debug( join(":", @$entry), 1 );
+ debug( join(":", @$entry), 1 ) if DEBUG;
my (undef, $archive, undef, $arch, $section, $subsection,
$priority, $version, $provided_by) = @$entry;
@@ -106,7 +100,7 @@ sub do_show {
$data{package} = $pkg;
$data{architecture} = $arch;
$data{version} = $version;
- $page->merge_package(\%data) or debug( "Merging $pkg $arch $version FAILED", 2 );
+ $page->merge_package(\%data) or debug( "Merging $pkg $arch $version FAILED", 2 ) if DEBUG;
} else {
$page->add_provided_by([split /\s+/, $provided_by]);
}
@@ -116,22 +110,22 @@ sub do_show {
$version = $page->{newest};
my $source = $page->get_newest( 'source' );
$archive = $page->get_newest( 'archive' );
- debug( "find source package: source=$source", 1);
+ debug( "find source package: source=$source", 1) if DEBUG;
my $src_data = $sources_all{"$archive $suite $source"};
$page->add_src_data( $source, $src_data )
if $src_data;
my $st1 = new Benchmark;
my $std = timediff($st1, $st0);
- debug( "Data search and merging took ".timestr($std) );
+ debug( "Data search and merging took ".timestr($std) ) if DEBUG;
- my ($v_str, $v_str_arch, $v_str_arr) = $page->get_version_string();
my $did = $page->get_newest( 'description' );
$section = $page->get_newest( 'section' );
$subsection = $page->get_newest( 'subsection' );
my $filenames = $page->get_arch_field( 'filename' );
my $file_md5sums = $page->get_arch_field( 'md5sum' );
my $archives = $page->get_arch_field( 'archive' );
+ my $versions = $page->get_arch_field( 'version' );
my $sizes_inst = $page->get_arch_field( 'installed-size' );
my $sizes_deb = $page->get_arch_field( 'size' );
my @archs = sort $page->get_architectures;
@@ -159,8 +153,15 @@ sub do_show {
_g( "All packages in this section" ),
"$ROOT/$suite/$subsection/",
$subsection ],
+ [ _g( "Source:" ),
+ _g( "Source package building this package" ),
+ "$ROOT/$suite/source/".$page->get_src('package'),
+ $page->get_src('package') ],
);
+ my $v_str = $version;
+ my $multiple_versions = grep { $_ ne $version } values %$versions;
+ $v_str .= _g(" and others") if $multiple_versions;
my $title .= sprintf( _g( "Package: %s (%s)" ), $pkg, $v_str );
$title .= " ".marker( $archive ) if $archive ne 'us';
$title .= " ".marker( $subsection ) if $subsection eq 'non-US'
@@ -168,8 +169,6 @@ sub do_show {
$title .= " ".marker( $section ) if $section ne 'main';
$package_page .= title( $title );
- $package_page .= "
"._g("Architecture")." | "._g("Files")." | "._g( "Package Size")." | "._g("Installed Size")." | "._g("Architecture")." | "; + $package_page .= ""._g("Version")." | " + if $multiple_versions; + $package_page .= ""._g( "Package Size")." | "._g("Installed Size")." | "._g("Files")." | \n"; foreach my $a ( @archs ) { $package_page .= "
---|---|---|---|---|---|---|---|
$a | \n"; - $package_page .= ""; + $package_page .= " | ".$versions->{$a}." | " + if $multiple_versions; + $package_page .= ''; + $package_page .= floor(($sizes_deb->{$a}/102.4)+0.5)/10 . " kB"; + $package_page .= ' | '; + $package_page .= $sizes_inst->{$a} . " kB"; + $package_page .= " | \n"; if ( $suite ne "experimental" ) { $package_page .= sprintf( "["._g( "list of files" )."]\n", "$ROOT/$suite/$encodedpkg/$a/filelist", $pkg ); } else { $package_page .= _g( "no current information" ); } - $package_page .= ' | '; - $package_page .= floor(($sizes_deb->{$a}/102.4)+0.5)/10 . " kB"; - $package_page .= ' | '; - $package_page .= $sizes_inst->{$a} . " kB"; $package_page .= " | \n