The branch, master has been updated
via d95ae2826970e6401b18ac959abf8891e88b93b1 (commit)
from a422fda321daf7052916ff65a10a1289d0a5a4ad (commit)
- Shortlog ------------------------------------------------------------
d95ae28 Dpkg::Version: fix compare_versions to handle properly the ">=" case
Summary of changes:
ChangeLog | 5 +++++
scripts/Dpkg/Version.pm | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit d95ae2826970e6401b18ac959abf8891e88b93b1
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Mon Oct 15 12:23:56 2007 +0200
Dpkg::Version: fix compare_versions to handle properly the ">=" case
diff --git a/ChangeLog b/ChangeLog
index 2366452..a1792c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-15 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* scripts/Dpkg/Version.pm: mark compare_versions as exportable.
diff --git a/scripts/Dpkg/Version.pm b/scripts/Dpkg/Version.pm
index b44dade..406f707 100644
--- 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'";
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
