The following commit has been merged in the master branch:
commit b52ab3ac586d5aea39788e787fd8895bd1e65bf9
Author: James Vega <[email protected]>
Date: Mon Apr 12 07:46:00 2010 -0400
Restore behavior of not validity checking upstream versions.
Closes: #577043
Signed-off-by: James Vega <[email protected]>
diff --git a/Devscripts/Versort.pm b/Devscripts/Versort.pm
index 24049f0..173c89f 100644
--- a/Devscripts/Versort.pm
+++ b/Devscripts/Versort.pm
@@ -28,9 +28,23 @@ use Dpkg::Version;
sub versort (@)
{
- my @namever_pairs = @_;
+ return _versort(0, @_);
+}
+
+sub deb_versort (@)
+{
+ return _versort(1, @_);
+}
+
+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;
- my @sorted = sort { version_compare($a->[0], $b->[0]) } @namever_pairs;
return reverse @sorted;
}
diff --git a/debian/changelog b/debian/changelog
index 4ff6410..a135e1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-devscripts (2.10.63) unreleased; urgency=low
+devscripts (2.10.63) UNRELEASED; urgency=low
+ [ Christoph Berg ]
* debcheckout: inject extra slash in "hg ssh://hg.debian.org//" URLs so
paths are not based in the user's $HOME.
+ [ James Vega ]
+ * Devscripts::Versort:
+ + Restore previous behavior of versort not performing a check on whether
+ the version is a valid Debian version. (Closes: #577043)
+ + Re-add deb_versort which ensures the versions are valid Debian versions.
+
-- Christoph Berg <[email protected]> Fri, 09 Apr 2010 21:31:24 +0200
devscripts (2.10.62) unstable; urgency=low
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 3bc5d4e..f4d0aac 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -562,7 +562,7 @@ if (defined $opt_uversion) {
# Now sort the list of directories, so that we process the most recent
# directories first, as determined by the package version numbers
-...@debdirs = Devscripts::Versort::versort(@debdirs);
+...@debdirs = Devscripts::Versort::deb_versort(@debdirs);
# Now process the watchfiles in order. If a directory d has subdirectories
# d/sd1/debian and d/sd2/debian, which each contain watchfiles corresponding
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
