[Checkins] SVN: zc.buildout/trunk/src/zc/buildout/buildout.py with -t option, timeout is set right away

[Godefroid Chapelle]

Log message for revision 109993:
  with -t option, timeout is set right away

Changed:
  U   zc.buildout/trunk/src/zc/buildout/buildout.py

-=-
Modified: zc.buildout/trunk/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/buildout.py	2010-03-16 14:42:43 UTC (rev 109992)
+++ zc.buildout/trunk/src/zc/buildout/buildout.py	2010-03-16 15:43:45 UTC (rev 109993)
@@ -32,6 +32,7 @@
 import re
 import shutil
 import sys
+import socket
 import tempfile
 import UserDict
 import zc.buildout
@@ -125,6 +126,11 @@
     }, 'DEFAULT_VALUE')
 
 
+def _setup_socket_timeout(timeout):
+    socket.setdefaulttimeout(timeout)
+    return 'Setting socket time out to %d seconds.' % timeout
+
+
 class Buildout(UserDict.DictMixin):
 
     def __init__(self, config_file, cloptions,
@@ -756,9 +762,10 @@
         if timeout <> '':
             try:
                 timeout = int(timeout)
-                import socket
-                self._logger.info('Setting socket time out to %d seconds.', timeout)
-                socket.setdefaulttimeout(timeout)
+                socket_timeout = socket.getdefaulttimeout()
+                if socket_timeout <> timeout:
+                    info_msg = _setup_socket_timeout(timeout)
+                    self._logger.info(info_msg)
             except ValueError:
                 self._logger.warning("Default socket timeout is used !\n"
                     "Value in configuration is not numeric: [%s].\n",
@@ -1637,6 +1644,9 @@
                         _error("No timeout value specified for option", orig_op)
                     except ValueError:
                         _error("Timeout value must be numeric", orig_op)
+
+                    info_msg = _setup_socket_timeout(timeout)
+                    print info_msg
             elif op:
                 if orig_op == '--help':
                     _help()