X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FPackages.pm;h=c7fd47c18b6f5dde189a563fe8e61ad2e8955a6e;hb=9ba3b5ba7379ac06399d7b296e7796b65fad6149;hp=88dc8b47a859dd081b62487e787cea7b580814c6;hpb=12c2b64ebe92a54ba90a15d0b02d3fc031b7bc07;p=debbugs.git

diff --git a/Debbugs/Packages.pm b/Debbugs/Packages.pm
index 88dc8b4..c7fd47c 100644
--- a/Debbugs/Packages.pm
+++ b/Debbugs/Packages.pm
@@ -12,7 +12,7 @@ package Debbugs::Packages;
 use warnings;
 use strict;
 
-use base qw(Exporter);
+use Exporter qw(import);
 use vars qw($VERSION @EXPORT_OK %EXPORT_TAGS @EXPORT);
 
 use Carp;
@@ -37,7 +37,7 @@ use Fcntl qw(O_RDONLY);
 use MLDBM qw(DB_File Storable);
 use Storable qw(dclone);
 use Params::Validate qw(validate_with :types);
-use Debbugs::Common qw(make_list globify_scalar);
+use Debbugs::Common qw(make_list globify_scalar sort_versions);
 
 use List::Util qw(min max);
 
@@ -223,8 +223,8 @@ sub binary_to_source{
 	}
 	# avoid autovivification
 	my $bin = $_binarytosource{$binary};
+	next unless defined $bin;
 	if (not @versions) {
-	    next unless defined $bin;
 	    for my $ver (keys %{$bin}) {
 		for my $ar (keys %{$bin->{$ver}}) {
 		    my $src = $bin->{$ver}{$ar};
@@ -234,7 +234,6 @@ sub binary_to_source{
 	    }
 	}
 	else {
-	    my $found_one_version = 0;
 	    for my $version (@versions) {
 		next unless exists $bin->{$version};
 		if (exists $bin->{$version}{all}) {
@@ -283,6 +282,9 @@ sub binary_to_source{
     if ($param{source_only}) {
 	my %uniq;
 	for my $s (@source) {
+	    # we shouldn't need to do this, but do this temporarily to
+	    # stop the warning.
+	    next unless defined $s->[0];
 	    $uniq{$s->[0]} = 1;
 	}
 	@result = sort keys %uniq;
@@ -390,6 +392,11 @@ may change in the future, so if you care, please code accordingly.)
 =item return_archs -- returns a version=>[archs] hash indicating which
 architectures are at which versions.
 
+=item largest_source_version_only -- if there is more than one source
+version in a particular distribution, discards all versions but the
+largest in that distribution. Defaults to 1, as this used to be the
+way that the Debian archive worked.
+
 =back
 
 When called in scalar context, this function will return hashrefs or
@@ -423,6 +430,9 @@ sub get_versions{
 					   return_archs => {type => BOOLEAN,
 							    default => 0,
 							   },
+					   largest_source_version_only => {type => BOOLEAN,
+								       default => 1,
+									  },
 					  },
 			       );
      my $versions;
@@ -444,6 +454,10 @@ sub get_versions{
      }
      my %versions;
      for my $package (make_list($param{package})) {
+	  my $source_only = 0;
+	  if ($package =~ s/^src://) {
+	       $source_only = 1;
+	  }
 	  my $version = $versions->{$package};
 	  next unless defined $version;
 	  for my $dist (make_list($param{dist})) {
@@ -451,12 +465,18 @@ sub get_versions{
 			     make_list($param{arch}):
 			     (grep {not $param{no_source_arch} or
 					$_ ne 'source'
-				    } keys %{$version->{$dist}})) {
+				    } $source_only?'source':keys %{$version->{$dist}})) {
 		    next unless defined $version->{$dist}{$arch};
-		    for my $ver (ref $version->{$dist}{$arch} ?
-				 keys %{$version->{$dist}{$arch}} :
-				 $version->{$dist}{$arch}
-				) {
+		    my @vers = ref $version->{$dist}{$arch} eq 'HASH' ?
+			keys %{$version->{$dist}{$arch}} :
+			    make_list($version->{$dist}{$arch});
+		    if ($param{largest_source_version_only} and
+			$arch eq 'source' and @vers > 1) {
+			# order the versions, then pick the biggest version number
+			@vers = sort_versions(@vers);
+			@vers = $vers[-1];
+		    }
+		    for my $ver (@vers) {
 			 my $f_ver = $ver;
 			 if ($param{source}) {
 			      ($f_ver) = make_source_versions(package => $package,
@@ -509,7 +529,6 @@ sub makesourceversions {
                           arch    => 'source',
                           versions => '0.1.1',
                           guess_source => 1,
-                          debug    => \$debug,
                           warnings => \$warnings,
                          );
 
@@ -552,7 +571,6 @@ sub make_source_versions {
 					},
 			     );
     my ($warnings) = globify_scalar(exists $param{warnings}?$param{warnings}:undef);
-    my ($debug)    = globify_scalar(exists $param{debug}   ?$param{debug}   :undef);
 
     my @packages = grep {defined $_ and length $_ } make_list($param{package});
     my @archs    = grep {defined $_ } make_list ($param{arch});
@@ -589,7 +607,7 @@ sub make_source_versions {
 		    my @bin_versions = sourcetobinary($1,$version);
 		    if (not @bin_versions or
 			@{$bin_versions[0]} != 3) {
-			print {$warnings} "The source $1 and version $2 do not appear to match any binary packages\n";
+			print {$warnings} "The source '$1' and version '$version' do not appear to match any binary packages\n";
 		    }
 		    next;
 		}
@@ -611,7 +629,7 @@ sub make_source_versions {
 		    }
 		    my @srcinfo = binary_to_source(binary => $pkg,
 						   version => $version,
-						   arch    => $arch);
+						   length($arch)?(arch    => $arch):());
 		    if (not @srcinfo) {
 			# We don't have explicit information about the
 			# binary-to-source mapping for this version