lintian: r981 - in trunk: debian lib

[rra@debian.org]

Author: rra
Date: 2007-10-16 05:09:35 +0200 (Tue, 16 Oct 2007)
New Revision: 981

Modified:
   trunk/debian/changelog
   trunk/lib/Dep.pm
Log:
* lib/Dep.pm:
  + [RA] Fix negative implication in some boundary cases when comparing
    two versioned relationships in the same direction.  Thanks to
    Raphael Hertzog for the analysis and fix.  (Closes: #446768)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-10-16 03:00:00 UTC (rev 980)
+++ trunk/debian/changelog	2007-10-16 03:09:35 UTC (rev 981)
@@ -9,8 +9,13 @@
     + [RA] Fix detection of commands for menu entries when the command is
       given with its full path.  (Closes: #446796)
 
- -- Russ Allbery <rra@debian.org>  Mon, 15 Oct 2007 19:58:18 -0700
+  * lib/Dep.pm:
+    + [RA] Fix negative implication in some boundary cases when comparing
+      two versioned relationships in the same direction.  Thanks to
+      Raphael Hertzog for the analysis and fix.  (Closes: #446768)
 
+ -- Russ Allbery <rra@debian.org>  Mon, 15 Oct 2007 20:09:28 -0700
+
 lintian (1.23.35) unstable; urgency=low
 
   The "frantic bug catchup" release.

Modified: trunk/lib/Dep.pm
===================================================================
--- trunk/lib/Dep.pm	2007-10-16 03:00:00 UTC (rev 980)
+++ trunk/lib/Dep.pm	2007-10-16 03:09:35 UTC (rev 981)
@@ -348,8 +348,10 @@
 	    return Dep::versions_gte($$p[3], $$q[3]) ? 0 : undef;
 	} elsif ($$p[2] eq '>=') {
 	    return Dep::versions_gt($$p[3], $$q[3]) ? 0 : undef;
+	} elsif ($$p[2] eq '=') {
+	    return Dep::versions_lte($$p[3], $$q[3]);
 	} else {
-	    return Dep::versions_lte($$p[3], $$q[3]);
+	    return Dep::versions_lte($$p[3], $$q[3]) ? 1 : undef;
 	}
     }
 
@@ -360,8 +362,10 @@
 	    return Dep::versions_gte($$p[3], $$p[3]) ? 0 : undef;
 	} elsif ($$p[2] eq '<<') {
 	    return Dep::versions_lte($$p[3], $$q[3]);
+	} elsif ($$p[2] eq '=') {
+	    return Dep::versions_lt($$p[3], $$q[3]);
 	} else {
-	    return Dep::versions_lt($$p[3], $$q[3]);
+	    return Dep::versions_lt($$p[3], $$q[3]) ? 1 : undef;
 	}
     }
 
@@ -371,8 +375,10 @@
 	    return Dep::versions_lte($$p[3], $$q[3]) ? 0 : undef;
 	} elsif ($$p[2] eq '<=') {
 	    return Dep::versions_lt($$p[3], $$q[3]) ? 0 : undef;
+	} elsif ($$p[2] eq '=') {
+	    return Dep::versions_gte($$p[3], $$q[3]);
 	} else {
-	    return Dep::versions_gte($$p[3], $$q[3]);
+	    return Dep::versions_gte($$p[3], $$q[3]) ? 1 : undef;
 	}
     }
     if ($$q[2] eq '>>') {
@@ -380,8 +386,10 @@
 	    return Dep::versions_lte($$p[3], $$q[3]) ? 0 : undef;
 	} elsif ($$p[2] eq '>>') {
 	    return Dep::versions_gte($$p[3], $$q[3]);
+	} elsif ($$p[2] eq '=') {
+	    return Dep::versions_gt($$p[3], $$q[3]);
 	} else {
-	    return Dep::versions_gt($$p[3], $$q[3]);
+	    return Dep::versions_gt($$p[3], $$q[3]) ? 1 : undef;
 	}
     }