From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 28 Dec 2011 19:37:47 +0000 (-0800)
Subject: [1502] revised the logic of checking equality of RR types as suggested in review
X-Git-Tag: trac2351_base~310^2~12^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f3f6eeff43f670d0c0f71216b87483b73d33607;p=thirdparty%2Fkea.git

[1502] revised the logic of checking equality of RR types as suggested in review
---

diff --git a/src/lib/python/isc/xfrin/diff.py b/src/lib/python/isc/xfrin/diff.py
index f9f5d510e4..80fa909990 100644
--- a/src/lib/python/isc/xfrin/diff.py
+++ b/src/lib/python/isc/xfrin/diff.py
@@ -166,9 +166,8 @@ class Diff:
             '''A helper routine to identify whether two RRsets are of the
             same 'type'.  For RRSIGs we should consider type covered, too.
             '''
-            if rrset1.get_type() != rrset2.get_type():
-                return False
-            if rrset1.get_type() != isc.dns.RRType.RRSIG():
+            if rrset1.get_type() != isc.dns.RRType.RRSIG() or \
+                    rrset2.get_type != isc.dns.RRType.RRSIG():
                 return rrset1.get_type() == rrset2.get_type()
             # RR type of the both RRsets is RRSIG.  Compare type covered.
             # We know they have exactly one RDATA.