diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-11-04 12:39:30 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-11-04 12:39:30 +0000 |
commit | f9b8e121b8244a3ea0ede26b0cbc4829ec3283f2 (patch) | |
tree | cf4397784226217a073cace5ff6b852f4fd9fe2e | |
parent | b2e1996507c2a614cdec9ec328a35c5db7456e04 (diff) |
Use Dpkg::Version::version_compare everywhere, not Dpkg::Version::version_compare_string. The latter is entirely wrong, meaning that dgit would get many version comparisons wrong. Closes:#768038.
-rw-r--r-- | debian/changelog | 9 | ||||
-rwxr-xr-x | dgit | 12 |
2 files changed, 15 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 49c3458..c8128f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +dgit (0.22.1) unstable; urgency=high + + * Use Dpkg::Version::version_compare everywhere, not + Dpkg::Version::version_compare_string. The latter is entirely wrong, + meaning that dgit would get many version comparisons wrong. + Closes:#768038. + + -- + dgit (0.22) unstable; urgency=medium Bugfixes: @@ -766,7 +766,7 @@ sub madison_parse ($) { $5 eq 'source' or die "$rmad ?"; push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite]; } - return sort { -version_compare_string($a->[0],$b->[0]); } @out; + return sort { -version_compare($a->[0],$b->[0]); } @out; } sub canonicalise_suite_madison ($$) { @@ -824,7 +824,7 @@ sub archive_query_sshpsql ($$) { AND source.source='$package' AND files.filename LIKE '%.dsc'; END - @rows = sort { -version_compare_string($a->[0],$b->[0]) } @rows; + @rows = sort { -version_compare($a->[0],$b->[0]) } @rows; my $digester = Digest::SHA->new(256); @rows = map { my ($vsn,$component,$filename,$sha256sum) = @$_; @@ -882,7 +882,7 @@ sub archive_query_dummycat ($$) { } C->error and die "$dpath: $!"; close C; - return sort { -version_compare_string($a->[0],$b->[0]); } @rows; + return sort { -version_compare($a->[0],$b->[0]); } @rows; } sub canonicalise_suite () { @@ -1096,7 +1096,7 @@ END my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog'); my $oversion = getfield $oldclogp, 'Version'; my $vcmp = - version_compare_string($oversion, $cversion); + version_compare($oversion, $cversion); if ($vcmp < 0) { # git upload/ is earlier vsn than archive, use archive open C, ">../commit2.tmp" or die $!; @@ -1278,7 +1278,7 @@ END my $gotclogp = parsechangelog("-l$clogf"); my $got_vsn = getfield $gotclogp, 'Version'; printdebug "SKEW CHECK GOT $got_vsn\n"; - if (version_compare_string($got_vsn, $skew_warning_vsn) < 0) { + if (version_compare($got_vsn, $skew_warning_vsn) < 0) { print STDERR <<END or die $!; Warning: archive skew detected. Using the available version: @@ -2053,7 +2053,7 @@ sub changesopts () { } if (@vsns) { @vsns = map { $_->[0] } @vsns; - @vsns = sort { -version_compare_string($a, $b) } @vsns; + @vsns = sort { -version_compare($a, $b) } @vsns; $changes_since_version = $vsns[0]; progress "changelog will contain changes since $vsns[0]"; } else { |