BIND 10 master, updated. 6e4e3ac19c322c65679c6c5653cc41b80305d9b9 [master] update changelog

[BIND 10 source code commits]

The branch, master has been updated
       via  6e4e3ac19c322c65679c6c5653cc41b80305d9b9 (commit)
       via  f80ab7879cc29f875c40dde6b44e3796ac98d6da (commit)
       via  00a99483151a21e73ef432dcba73347e1fd407f2 (commit)
      from  d5ade3d32087884e477d8f5b2fa200324b96ea0a (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 6e4e3ac19c322c65679c6c5653cc41b80305d9b9
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Nov 2 10:20:52 2011 +0100

    [master] update changelog

commit f80ab7879cc29f875c40dde6b44e3796ac98d6da
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Nov 2 10:08:36 2011 +0100

    [1345] style fix (reduntant space)

commit 00a99483151a21e73ef432dcba73347e1fd407f2
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Oct 28 17:43:59 2011 +0200

    [1345] remove - from word boundaries in readline if present

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

Summary of changes:
 ChangeLog                  |    6 ++++++
 src/bin/bindctl/bindcmd.py |   14 ++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 3e40ac3..31e191e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+311.	[bug]		jelte
+	Fixed a bug in bindctl where tab-completion for names that
+	contain a hyphen resulted in unexpected behaviour, such as
+	appending the already-typed part again.
+	(Trac #1345, git f80ab7879cc29f875c40dde6b44e3796ac98d6da)
+
 310.	[bug]		jelte
 	Fixed a bug where bindctl could not set a value that is optional
 	and has no default, resulting in the error that the setting
diff --git a/src/bin/bindctl/bindcmd.py b/src/bin/bindctl/bindcmd.py
index 8c2b674..9ff5b96 100644
--- a/src/bin/bindctl/bindcmd.py
+++ b/src/bin/bindctl/bindcmd.py
@@ -109,6 +109,18 @@ class BindCmdInterpreter(Cmd):
         else:
             self.csv_file_dir = pwd.getpwnam(getpass.getuser()).pw_dir + \
                 os.sep + '.bind10' + os.sep
+        self._update_readline_word_boundary()
+
+    def _update_readline_word_boundary(self):
+        # This is a fix for the problem described in
+        # http://bind10.isc.org/ticket/1345
+        # If '-' is seen as a word-boundary, the final completion-step
+        # (as handled by the cmd module, and hence outside our reach) can
+        # mistakenly add data twice, resulting in wrong completion results
+        # The solution is to remove it.
+        delims = readline.get_completer_delims()
+        delims = delims.replace('-', '')
+        readline.set_completer_delims(delims)
 
     def _get_session_id(self):
         '''Generate one session id for the connection. '''
@@ -507,13 +519,11 @@ class BindCmdInterpreter(Cmd):
                 hints = []
 
             self.hint = hints
-            #self._append_space_to_hint()
 
         if state < len(self.hint):
             return self.hint[state]
         else:
             return None
-            
 
     def _get_module_startswith(self, text):       
         return [module