lintian: r127 - in trunk: debian lib

[djpig@debian.org]

Author: djpig
Date: 2004-04-08 04:18:35 +0200 (Thu, 08 Apr 2004)
New Revision: 127

Modified:
   trunk/debian/changelog
   trunk/lib/Dep.pm
Log:
Fixed some semantic errors (since noone ever observed the
correspoding perl warnings the fixed parts are probably never
used in the current code)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-04-08 02:04:06 UTC (rev 126)
+++ trunk/debian/changelog	2004-04-08 02:18:35 UTC (rev 127)
@@ -5,6 +5,11 @@
   * [FL] add udeb support (Closes: #216117)
     Thanks to Joey Hess for his input. Many changes, mostly to
      frontend/lintian, checks/debconf and checks/files
+  
+  * lib/Dep.pm:
+    + [FL] Fixed some semantic errors (since noone ever observed the
+      correspoding perl warnings the fixed parts are probably never
+      used in the current code)
 
   * checks/binaries:
     + [JvW] Ignore static binaries in /usr/lib/debug

Modified: trunk/lib/Dep.pm
===================================================================
--- trunk/lib/Dep.pm	2004-04-08 02:04:06 UTC (rev 126)
+++ trunk/lib/Dep.pm	2004-04-08 02:18:35 UTC (rev 127)
@@ -137,21 +137,21 @@
     if ($$q[0] eq 'PRED') {
 	if ($$p[0] eq 'PRED') {
 	    return Dep::pred_implies_inverse($p, $q);
-	} elsif ($$p eq 'AND') {
+	} elsif ($$p[0] eq 'AND') {
 	    # q's falsehood can be deduced from any of p's clauses
 	    $i = 1;
 	    while ($i < @$p) {
 		return 1 if Dep::implies_inverse($$p[$i++], $q);
 	    }
 	    return 0;
-	} elsif ($$p eq 'OR') {
+	} elsif ($$p[0] eq 'OR') {
 	    # q's falsehood must be deduced from each of p's clauses
 	    $i = 1;
 	    while ($i < @$p) {
 		return 0 if not Dep::implies_inverse($$p[$i++], $q);
 	    }
 	    return 1;
-	} elsif ($$p eq 'NOT') {
+	} elsif ($$p[0] eq 'NOT') {
 	    return Dep::implies($q, $$p[1]);
 	}
     } elsif ($$q[0] eq 'AND') {
@@ -165,7 +165,7 @@
 	# Each of q's clauses must be falsified by p.
 	$i = 1;
 	while ($i < @$q) {
-	    return 0 if not Dep::implies($p, $$q[$i++]);
+	    return 0 if not Dep::implies_inverse($p, $$q[$i++]);
 	}
 	return 1;
     } elsif ($$q[0] eq 'NOT') {
@@ -226,7 +226,7 @@
 # can be deduced from the truth of the first.
 sub pred_implies_inverse {
     my ($p, $q) = @_;
-    my $res = Dep::pred_implies($$q, $$p);
+    my $res = Dep::pred_implies($q, $p);
 
     return not $res if defined $res;
     return undef;