merge changes from dla source

[debbugs.git] / Debbugs / Packages.pm

diff --git a/Debbugs/Packages.pm b/Debbugs/Packages.pm
index 5db565d21c3e4cf4d037a63a4e1b9a1bf650eb18..a7bf363d8ef5ead440e98f8f3fd0ae595a3b4360 100644 (file)
--- a/Debbugs/Packages.pm
+++ b/Debbugs/Packages.pm
@@ -144,6 +144,9 @@ sub binarytosource {
     # need an extra cache for speed here.
     return () unless defined $gBinarySourceMap;
 
+    if ($binname =~ m/^src:(.+)$/) {
+       return $1;
+    }
     if (not tied %_binarytosource) {
         tie %_binarytosource, MLDBM => $gBinarySourceMap, O_RDONLY or
              die "Unable to open $gBinarySourceMap for reading";
@@ -423,7 +426,7 @@ sub make_source_versions {
     my %param = validate_with(params => \@_,
                              spec   => {package => {type => SCALAR|ARRAYREF,
                                                    },
-                                        arch    => {type => SCALAR|ARRAYREF,
+                                        arch    => {type => SCALAR|ARRAYREF|UNDEF,
                                                     default => ''
                                                    },
                                         versions => {type => SCALAR|ARRAYREF,
@@ -484,7 +487,7 @@ sub make_source_versions {
                    }
                    elsif ($param{guess_source} and
                           exists$param{source_version_cache}{$cachekey.'/guess'}) {
-                       for my $v (@{$param{source_version_cache}{$cachekey}}) {
+                       for my $v (@{$param{source_version_cache}{$cachekey.'/guess'}}) {
                            $sourceversions{$v} = 1;
                        }
                        next;