my $suite = $opts->{suite}[0];
my $str = "";
- foreach my $p ( @$pkgs ) {
+ foreach my $p ( sort @$pkgs ) {
+ # we don't deal with virtual packages here because for the
+ # current uses of this function this isn't needed
my $short_desc = (read_entry_simple( $packages, $p, $opts->{h_archives}, $suite))->[-1];
if ( $short_desc ) {
} else {
foreach( @$files ) {
my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
- for ($page->get_newest('archive')) {
+ for ("$suite/".$page->get_newest('archive')) {
/security/o && do {
$str .= "<a href=\"$env->{security}/$src_dir/$src_file_name\">["; last };
/volatile/o && do {
/backports/o && do {
$str .= "<a href=\"$env->{backports}/$src_dir/$src_file_name\">["; last };
/non-us/io && do {
- $str .= "<a href=\"$env->{nonus_site}/$src_dir/$src_file_name\">["; last };
+ $str .= "<a href=\"$env->{'non-US'}/$src_dir/$src_file_name\">["; last };
$str .= "<a href=\"$env->{us}/$src_dir/$src_file_name\">[";
}
if ($src_file_name =~ /dsc$/) {
} # end dep_item
sub provides_string {
- my ($path, $entry) = @_;
+ my ($path, $entry,$also) = @_;
my @provided_by = split /\s/, $entry;
- my $short_desc = "virtual package provided by ";
+ my $short_desc = $also ? _g("also a virtual package provided by ")
+ : _g("virtual package provided by ");
if (@provided_by < 10) {
$short_desc .= join( ', ',map { "<a href=\"$path/$_\">$_</a>" } @provided_by);
} else {
- $short_desc .= scalar(@provided_by)." packages";
+ $short_desc .= sprintf( _g("%s packages"), scalar(@provided_by));
}
return $short_desc;
}
my $short_desc = $entry->[-1];
my $arch = $entry->[3];
my $archive = $entry->[1];
+ my $path = $entry->[2];
if ( $short_desc ) {
- my $path = $suite;
if ( $is_old_pkgs ) {
push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
$p_name, "$pkg_version$arch_str" );
} elsif (defined $entry->[1]) {
$entries{$p_name} ||= $entry;
$short_desc = encode_entities( $short_desc, "<>&\"" );
- $short_desc .= "<br>Also, a ".provides_string( "$ROOT/$path",
- $entry->[0] )
+ $short_desc .= "<br>".provides_string( "$ROOT/$path",
+ $entry->[0],
+ 1 )
if defined $entry->[0];
push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
$p_name, "$pkg_version$arch_str", $short_desc );