BIND 10 trac588, updated. f009a637580c569a49a74b87a384a242c5a5f30a [trac588] fix a bug(bindctl traceback on shutdown) and hide some log while using non-interactive bindctl

[BIND 10 source code commits]

The branch, trac588 has been updated
       via  f009a637580c569a49a74b87a384a242c5a5f30a (commit)
      from  416fcf7eb6c7c0dc249bcc838d75504f070750a1 (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 f009a637580c569a49a74b87a384a242c5a5f30a
Author: chenzhengzhang <jerry.zzpku at gmail.com>
Date:   Wed Mar 9 17:27:38 2011 +0800

    [trac588] fix a bug(bindctl traceback on shutdown) and hide some log while using non-interactive bindctl

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

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

-----------------------------------------------------------------------
diff --git a/src/bin/bindctl/bindcmd.py b/src/bin/bindctl/bindcmd.py
index 683dda9..df87b13 100644
--- a/src/bin/bindctl/bindcmd.py
+++ b/src/bin/bindctl/bindcmd.py
@@ -123,8 +123,10 @@ class BindCmdInterpreter(Cmd):
         except FailToLogin as err:
             # error already printed when this was raised, ignoring
             pass
-        except KeyboardInterrupt:
+        except (KeyboardInterrupt, socket.error):
             print('\nExit from bindctl')
+        except http.client.CannotSendRequest:
+            print('Failed to send request, the connection is busy')
 
     def _get_saved_user_info(self, dir, file_name):
         ''' Read all the available username and password pairs saved in 
@@ -188,7 +190,9 @@ class BindCmdInterpreter(Cmd):
                 raise FailToLogin()
 
             if response.status == http.client.OK:
-                print(data + ' login as ' + row[0] )
+                # Is interactive?
+                if sys.stdin.isatty():
+                    print(data + ' login as ' + row[0] )
                 return True 
 
         count = 0