From: Frank Lichtenheld Date: Tue, 28 Feb 2006 17:30:32 +0000 (+0000) Subject: Don't let come virtual packages in our way X-Git-Tag: switch-to-templates~31 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=9a24f343a769654b1f0e128a3e61855a3d552ca8;p=deb%2Fpackages.git Don't let come virtual packages in our way also use new URL handling here --- diff --git a/lib/Packages/DoDownload.pm b/lib/Packages/DoDownload.pm index d2dab30..60a50cb 100644 --- a/lib/Packages/DoDownload.pm +++ b/lib/Packages/DoDownload.pm @@ -232,6 +232,7 @@ sub do_download { read_entry( \%packages, $pkg, \@results, $opts ); + @results = grep { $_->[7] ne 'v' } @results; unless (@results) { fatal_error( _g( "No such package." )."
". sprintf( _g( 'Search for the package' ), "$SEARCH_URL/$pkg" ) ); @@ -243,6 +244,7 @@ sub do_download { } } + debug( "final_result=@$final_result", 1 ); $archive = $final_result->[1]; my %data = split /\000/, $packages_all{"$pkg $arch $final_result->[7]"}; $file = $data{filename}; @@ -270,10 +272,12 @@ sub do_download { $$page_content .= "

".sprintf( _g( 'You can download the requested file from the %s subdirectory at:' ), $directory )."

\n"; } - hint(_g("If you are running Debian, it's strongly suggested to use a - package manager like aptitude or synaptic to download and install - packages, instead of doing so manually via this website")); + hint(sprintf(_g("If you are running Debian, it's strongly suggested to use a + package manager like aptitude or synaptic to download and install + packages, instead of doing so manually via this website."), + make_url('aptitude','',{arch=>undef}), + make_url('synaptic','',{arch=>undef}) ) ); if ($archive eq 'security') {