BIND 10 trac680, updated. ac0eaa438f7b76f1f58d54070313e9ffc5417c26 [680] Update text and added code comments

BIND 10 source code commits bind10-changes at lists.isc.org
Mon Jan 14 16:18:42 UTC 2013


The branch, trac680 has been updated
       via  ac0eaa438f7b76f1f58d54070313e9ffc5417c26 (commit)
      from  76c52a9395ff0b7bcd9b911308d43da8171a7cd5 (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 ac0eaa438f7b76f1f58d54070313e9ffc5417c26
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Jan 14 17:18:07 2013 +0100

    [680] Update text and added code comments

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

Summary of changes:
 src/bin/bindctl/bindcmd.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bindctl/bindcmd.py b/src/bin/bindctl/bindcmd.py
index 06ce493..7c2b2af 100644
--- a/src/bin/bindctl/bindcmd.py
+++ b/src/bin/bindctl/bindcmd.py
@@ -208,12 +208,13 @@ WARNING: Python readline module isn't available, so the command line editor
         return True
 
     def login_to_cmdctl(self):
-        '''Login to cmdctl with the username and password inputted
-        from user. After the login is sucessful, the username and
+        '''Login to cmdctl with the username and password given by
+        the user. After the login is sucessful, the username and
         password will be saved in 'default_user.csv', when run the next
         time, username and password saved in 'default_user.csv' will be
         used first.
         '''
+        # Look at existing username/password combinations and try to log in
         users = self._get_saved_user_info(self.csv_file_dir, CSV_FILE_NAME)
         for row in users:
             param = {'username': row[0], 'password' : row[1]}
@@ -230,9 +231,11 @@ WARNING: Python readline module isn't available, so the command line editor
                     print(data + ' login as ' + row[0])
                 return True
 
+        # No valid logins were found, prompt the user for a username/password
         count = 0
-        print("No stored password file found, please see sections 7.1 and "
-              "8.1 of the BIND 10 guide.")
+        print('No stored password file found, please see sections '
+              '"Configuration specification for b10-cmdctl" and "bindctl '
+              'command-line options" of the BIND 10 guide.')
         while True:
             count = count + 1
             if count > 3:



More information about the bind10-changes mailing list