lib/Packages/DoShow.pm: Don't shorten the dsc name

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

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index cfe7a90f783ff8486ae74f909dc1b6ed06c6de36..3af5e3e7c83056a118a40dcd6ac587677903752b 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -111,6 +111,8 @@ sub do_show {
 
                        debug( "find source package: source=$source", 1) if DEBUG;
                        my $src_data = $sources_all{"$archive $suite $source"};
+                       #FIXME: should be $main_archive or similar, not hardcoded "us"
+                       $src_data = $sources_all{"us $suite $source"} unless $src_data;
                        $page->add_src_data( $source, $src_data )
                            if $src_data;
 
@@ -201,6 +203,7 @@ sub do_show {
                                      instsize => $sizes_inst->{$a}, );
 
                            $d{version} = $versions->{$a} if $multiple_versions;
+                           $d{archive} = $archives->{$a};
                            if ( ($suite ne "experimental")
                                 && ($subsection ne 'debian-installer')) {
                                $d{contents_avail} = 1;
@@ -334,17 +337,12 @@ sub moreinfo {
        if (defined($files) and @$files) {
            foreach( @$files ) {
                my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
-               my ($name, $server, $path);
+               my ($server, $path);
                # non-US hack
                ($server = lc $page->get_newest('archive')) =~ s/-//go;
                $server = $env->{$server}||$env->{us};
-               $path = "$src_dir/$src_file_name";
-               if ($src_file_name =~ /dsc$/) {
-                   $name = 'dsc'
-               } else {
-                   $name = $src_file_name;
-               }
-               push @downloads, { name => $name, server => $server, path => $path };
+               $path = "/$src_dir/$src_file_name";
+               push @downloads, { name => $src_file_name, server => $server, path => $path };
            }
        }
        $contents->{src}{downloads} = \@downloads;