Преглед изворни кода

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

Raphael Hertzog пре 19 година
родитељ
комит
d95ae28269
2 измењених фајлова са 7 додато и 2 уклоњено
  1. 5 0
      ChangeLog
  2. 2 2
      scripts/Dpkg/Version.pm

+ 5 - 0
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.

+ 2 - 2
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'";