Dpkg::Version: fix compare_versions to handle properly the ">=" case

diff --git a/ChangeLog b/ChangeLog
index 23664525e6386537baae713496661f56dde4b43f..a1792c19547269de5e78ce21a1b576eeef080277 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-15  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/Dpkg/Version.pm: fix compare_versions to handle properly
+         the >= cases (it was improperly handled like >> due to a bad regexp).
+
 2007-10-14  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg/Version.pm: mark compare_versions as exportable.

diff --git a/scripts/Dpkg/Version.pm b/scripts/Dpkg/Version.pm
index b44dade75a03bb929fb08032f736baad5286169e..406f707a89220f6b2c86da18e283eba5dfab7d23 100644 (file)
--- a/scripts/Dpkg/Version.pm
+++ b/scripts/Dpkg/Version.pm
@@ -177,7 +177,7 @@ sub compare_versions ($$$)
     my $rel = $_[1];
     my $res = vercmp($_[0], $_[2]);
 
-    if ($rel eq 'gt' or $rel =~ />?>/) {
+    if ($rel eq 'gt' or $rel eq ">" or $rel eq ">>") {
        return $res > 0;
     } elsif ($rel eq 'ge' or $rel eq '>=') {
        return $res >= 0;
@@ -185,7 +185,7 @@ sub compare_versions ($$$)
        return $res == 0;
     } elsif ($rel eq 'le' or $rel eq '<=') {
        return $res <= 0;
-    } elsif ($rel eq 'lt' or $rel =~ /<?</) {
+    } elsif ($rel eq 'lt' or $rel eq "<" or $rel eq "<<") {
        return $res < 0;
     } else {
        die "bad relation '$rel'";