The following commit has been merged in the master branch:
commit e4ee272b863bbd1e81563f6b8969b36aa422ec9f
Author: James Vega <[email protected]>
Date: Tue Apr 13 16:38:06 2010 -0400
Devscripts::Versort: Do not truncate lists passed in to _versort.
Closes: #577654
Signed-off-by: James Vega <[email protected]>
diff --git a/Devscripts/Versort.pm b/Devscripts/Versort.pm
index 173c89f..d2f5ecd 100644
--- a/Devscripts/Versort.pm
+++ b/Devscripts/Versort.pm
@@ -40,12 +40,17 @@ sub _versort ($@)
{
my ($check, @namever_pairs) = @_;
- my @sorted = map { [$_->[0], $_->[1]] }
- sort { $a->[2] <=> $b->[2] }
- map { [$_->[0], $_->[1], Dpkg::Version->new($_->[0], check =>
$check)] }
- @namever_pairs;
+ foreach my $pair (@namever_pairs) {
+ unshift(@$pair, Dpkg::Version->new($pair->[0], check => $check));
+ }
- return reverse @sorted;
+ my @sorted = sort { $b->[0] <=> $a->[0] } @namever_pairs;
+
+ foreach my $pair (@sorted) {
+ shift @$pair;
+ }
+
+ return @sorted;
}
1;
diff --git a/debian/changelog b/debian/changelog
index f69e24e..2f7e412 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
-devscripts (2.10.64) UNSTABLE; urgency=low
+devscripts (2.10.64) UNRELEASED; urgency=low
+ [ Stefano Zacchiroli ]
* devscripts.1: generic documentation for $DEBEMAIL and $DEBFULLNAME
+ [ James Vega ]
+ * Devscripts::Versort: Correct _versort so the lists it returns aren't
+ shorter than the ones passed in to _versort. (Closes: #577654)
+
-- Stefano Zacchiroli <[email protected]> Tue, 13 Apr 2010 16:31:50 +0200
devscripts (2.10.63) unstable; urgency=low
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
