BIND 10 trac1299, updated. cce182ed937f7294b2a11a3af5b2e03a380b7cd5 [1299] updated some exception messages as suggested in review

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Dec 6 18:59:18 UTC 2011


The branch, trac1299 has been updated
       via  cce182ed937f7294b2a11a3af5b2e03a380b7cd5 (commit)
      from  49f1f1bc36042d4b4c27a002e963f400deb694d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cce182ed937f7294b2a11a3af5b2e03a380b7cd5
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Dec 6 10:50:43 2011 -0800

    [1299] updated some exception messages as suggested in review

-----------------------------------------------------------------------

Summary of changes:
 src/bin/xfrin/xfrin.py.in |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index e65160e..1167bef 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -732,14 +732,16 @@ class XfrinConnection(asyncore.dispatcher):
         # Validate the question section
         n_question = msg.get_rr_count(Message.SECTION_QUESTION)
         if n_question != 1:
-            raise XfrinProtocolError('Invalid number of questions to ' +
-                                     'SOA query (' + str(n_question) + ')')
+            raise XfrinProtocolError('Invalid response to SOA query: ' +
+                                     '(' + str(n_question) + ' questions, 1 ' +
+                                     'expected)')
         resp_question = msg.get_question()[0]
         if resp_question.get_name() != self._zone_name or \
                 resp_question.get_class() != self._rrclass or \
                 resp_question.get_type() != RRType.SOA():
-            raise XfrinProtocolError('Questions mismatch to ' +
-                                     'SOA query: ' + str(resp_question))
+            raise XfrinProtocolError('Invalid response to SOA query: '
+                                     'question mismatch: ' +
+                                     str(resp_question))
 
         # Look into the answer section for SOA
         soa = None
@@ -760,7 +762,8 @@ class XfrinConnection(asyncore.dispatcher):
                     raise XfrinProtocolError('SOA query resulted in referral')
                 if rr.get_type() == RRType.SOA():
                     raise XfrinProtocolError('SOA query resulted in NODATA')
-            raise XfrinProtocolError('SOA query resulted in no SOA at all')
+            raise XfrinProtocolError('No SOA record found in response to ' +
+                                     'SOA query')
 
         # Check if the SOA is really what we asked for
         if soa.get_name() != self._zone_name or \




More information about the bind10-changes mailing list