- Fix some issues with non-US handling

[deb/packages.git] / lib / Packages / DoDownload.pm

diff --git a/lib/Packages/DoDownload.pm b/lib/Packages/DoDownload.pm
index ab3ab73197cd47ef4cc01f7223c94ec07d2b5c9a..89da639639cad7ced9e5f9352b2e191aeb6856a4 100644 (file)
--- a/lib/Packages/DoDownload.pm
+++ b/lib/Packages/DoDownload.pm
@@ -133,7 +133,12 @@ our @kfreebsd_european_sites = (
         "kfreebsd-gnu.debian.net/debian",
         "ftp.easynet.be/ftp/gnuab/debian",
        "ftp.de.debian.org/debian-kfreebsd",
+       "ftp.sh.cvut.cz/MIRRORS/debian-non-linux",
+       "ftp.eila.jussieu.fr/pub/Debian-gnuab",
                               );
+my @kfreebsd_asian_sites = (
+       "ftp.citkit.ru/pub/HURD/debian",
+                           );
 our @nonus_north_american_sites = (
 #      "ftp.ca.debian.org/debian-non-US",
        "debian.yorku.ca/debian/non-US",
@@ -193,7 +198,8 @@ our %arches = (
         s390    => 'IBM S/390',
        "hurd-i386" => 'Hurd (i386)',
        amd64   => 'AMD64',
-       "kfreebsd-i386" => 'GNU/kFreeBSD (i386)'
+       "kfreebsd-i386" => 'GNU/kFreeBSD (i386)',
+       "kfreebsd-amd64" => 'GNU/kFreeBSD (amd64)'
 );
 
 sub do_download {
@@ -232,6 +238,7 @@ sub do_download {
        
        read_entry( \%packages, $pkg, \@results, $opts );
 
+       @results = grep { $_->[7] ne 'v' } @results;
        unless (@results) {
            fatal_error( _g( "No such package." )."<br>".
                         sprintf( _g( '<a href="%s">Search for the package</a>' ), "$SEARCH_URL/$pkg" ) );
@@ -243,6 +250,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};
@@ -269,62 +277,59 @@ sub do_download {
        } else {
            $$page_content .= "<p>".sprintf( _g( 'You can download the requested file from the <tt>%s</tt> subdirectory at:' ), $directory )."</p>\n";
        }
+
+       hint(sprintf(_g("If you are running Debian, it's strongly suggested to use a
+           package manager like <a href=\"%s\">aptitude</a> or <a
+           href=\"%s\">synaptic</a> 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') {
            
            $$page_content .= "<ul><li><a href=\"http://security.debian.org/debian-security/$file\">security.debian.org/debian-security</a></li></ul>";
            $$page_content .= '<p>'._g( 'Debian security updates are currently officially distributed only via <tt>security.debian.org</tt>.' ).'</p>';
-       } elsif ($arch eq 'amd64') {
+       } elsif ($archive eq 'amd64') {
 
            $$page_content .= print_links( _g( "North America" ), $file, @amd64_north_american_sites );
            $$page_content .= print_links( _g( "Europe" ), $file, @amd64_european_sites );
-#    $$page_content .= print_links( "Australia and New Zealand", $file,
-#               @nonus_australian_sites );
            $$page_content .= print_links( _g( "Asia" ), $file, @amd64_asian_sites );
-#    $$page_content .= print_links( "South America", $file, @nonus_south_american_sites );
 
            $$page_content .= '<p>'._g( 'Note that AMD64 is not officialy included in the Debian archive yet, but the AMD64 porter group keeps their archive in sync with the official archive as close as possible. See the <a href="http://www.debian.org/ports/amd64/">AMD64 ports page</a> for current information.' ).'</p>';
-       } elsif ($arch eq 'kfreebsd-i386') {
+       } elsif ($archive eq 'kfreebsd') {
 
            $$page_content .= print_links( _g( "North America" ), $file, @kfreebsd_north_american_sites );
            $$page_content .= print_links( _g( "Europe" ), $file, @kfreebsd_european_sites );
-#    $$page_content .= print_links( "Australia and New Zealand", $file,
-#               @nonus_australian_sites );
-#    $$page_content .= print_links( "Asia", $file, @amd64_asian_sites );
-#    $$page_content .= print_links( "South America", $file, @nonus_south_american_sites );
+           $$page_content .= print_links( _g( "Asia" ), $file, @kfreebsd_asian_sites );
        
            $$page_content .= '<p>'._g( 'Note that GNU/kFreeBSD is not officialy included in the Debian archive yet, but the GNU/kFreeBSD porter group keeps their archive in sync with the official archive as close as possible. See the <a href="http://www.debian.org/ports/kfreebsd-gnu/">GNU/kFreeBSD ports page</a> for current information.' ).'</p>';
        } elsif ($archive eq 'non-US') {
 
+           $$page_content .= '<div class="cardleft">';
            $$page_content .= print_links( _g( "North America" ), $file, @nonus_north_american_sites );
-           $$page_content .= print_links( _g( "Europe" ), $file, @nonus_european_sites );
            $$page_content .= print_links( _g( "Australia and New Zealand" ), $file,
                                           @nonus_australian_sites );
            $$page_content .= print_links( _g( "Asia" ), $file, @nonus_asian_sites );
            $$page_content .= print_links( _g( "South America" ), $file, @nonus_south_american_sites );
-           
-           $$page_content .= '<p>'.sprintf( _g('If none of the above sites are fast enough for you, please see our <a href="%s">complete mirror list</a>.' ), 'http://www.debian.org/mirror/list-non-US' ).'</p>';
+           $$page_content .= '</div><div class="cardright">';
+           $$page_content .= print_links( _g( "Europe" ), $file, @nonus_european_sites );
+           $$page_content .= '</div>';
+
+           $$page_content .= '<p style="clear:both">'.sprintf( _g('If none of the above sites are fast enough for you, please see our <a href="%s">complete mirror list</a>.' ), 'http://www.debian.org/mirror/list-non-US' ).'</p>';
        } elsif ($archive eq 'backports') {
        
-#    $$page_content .= print_links( "North America", $file, @nonus_north_american_sites );
            $$page_content .= '<div class="cardleft">';
            $$page_content .= print_links( _g( "Europe" ), $file, @backports_european_sites );
            $$page_content .= '</div><div class="cardright">';
            $$page_content .= print_links( _g( "Australia and New Zealand" ), $file,
                                           @backports_australian_sites );
            $$page_content .= print_links( _g( "Asia" ), $file, @backports_asian_sites );
-#    $$page_content .= print_links( "South America", $file, @nonus_south_american_sites );
            $$page_content .= '</div>';
            
            $$page_content .= '<p style="clear:both">'.sprintf( _g( 'If none of the above sites are fast enough for you, please see our <a href="%s">complete mirror list</a>.'), 'http://www.backports.org/debian/README.mirrors.html' ).'</p>';
        } elsif ($archive eq 'volatile') {
            
-#    $$page_content .= print_links( "North America", $file, @nonus_north_american_sites );
            $$page_content .= print_links( _g( "Europe" ), $file, @volatile_european_sites );
-#    $$page_content .= print_links( "Australia and New Zealand", $file,
-#               @nonus_australian_sites );
-#    $$page_content .= print_links( "Asia", $file, @nonus_asian_sites );
-#    $$page_content .= print_links( "South America", $file, @nonus_south_american_sites );
 
            $$page_content .= '<p>'.sprintf( _g( 'If none of the above sites are fast enough for you, please see our <a href="%s">complete mirror list</a>.' ), 'http://volatile.debian.net/mirrors.html' ).'</p>';
        } elsif ($archive eq 'us') {