X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPackages%2FDoShow.pm;h=08eb376d236ddb237999af2258cae7048eabb64d;hb=f27f1fcc5bffc0696f694e962eb40dbb0c554855;hp=6efef581f101eb2da6f4de28e7079dbba5be187a;hpb=eb5c6135119af5de93a6d00ade6618676b767a2f;p=deb%2Fpackages.git
diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 6efef58..08eb376 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -97,7 +97,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 +106,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,14 +116,14 @@ 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 $did = $page->get_newest( 'description' );
$section = $page->get_newest( 'section' );
@@ -229,24 +229,24 @@ sub do_show {
$package_page .= "
"._g("Architecture")." | ";
$package_page .= ""._g("Version")." | "
if $multiple_versions;
- $package_page .= ""._g("Files")." | "._g( "Package Size")." | "._g("Installed Size")." | \n";
+ $package_page .= ""._g( "Package Size")." | "._g("Installed Size")." | "._g("Files")." | \n";
foreach my $a ( @archs ) {
$package_page .= "\n";
$package_page .= "$a | \n";
$package_page .= "".$versions->{$a}." | "
if $multiple_versions;
- $package_page .= "";
+ $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
";
}
$package_page .= "\n";
@@ -288,19 +288,19 @@ sub do_show {
} # else (unless $page->is_virtual)
} else { # unless $opts->{source}
for my $entry (@results) {
- debug( join(":", @$entry), 1 );
+ debug( join(":", @$entry), 1 ) if DEBUG;
my (undef, $archive, undef, $section, $subsection,
$priority, $version) = @$entry;
my $data = $sources_all{"$archive $suite $pkg"};
$page->merge_data($pkg, $suite, $archive, $data)
- or debug( "Merging $pkg $version FAILED", 2 );
+ or debug( "Merging $pkg $version FAILED", 2 ) if DEBUG;
}
$version = $page->{version};
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;
$archive = $page->get_newest( 'archive' );
$section = $page->get_newest( 'section' );
@@ -426,7 +426,7 @@ sub do_show {
}
# use Data::Dumper;
-# debug( "Final page object:\n".Dumper($page), 3 );
+# debug( "Final page object:\n".Dumper($page), 3 ) if DEBUG;
my $title = $opts->{source} ?
_g( "Details of source package %s in %s" ) :