[Pkg-privacy-commits] [obfsproxy] 36/353: Merge branch 'master' of https://github.com/blanu/py-obfsproxy

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit a4098606b1ddac9b73debdbd44c24d15abaaffbb
Merge: 1c35c58 6acaf22
Author: Brandon Wiley <brandon at blanu.net>
Date:   Mon Aug 27 15:34:23 2012 -0500

    Merge branch 'master' of https://github.com/blanu/py-obfsproxy

 src/cli.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --cc src/cli.py
index 8f08a80,0ce903d..d7cb765
--- a/src/cli.py
+++ b/src/cli.py
@@@ -66,15 -70,21 +66,17 @@@ if __name__ == '__main__'
  
      logging.error('py-obfsproxy CLI loaded')
  
-     daemon = None
-     if args.managed:
-         if checkClientMode():
-             logging.error('client')
-             daemon = ManagedClient()
+     try:
+         daemon = None
+         if args.managed:
+             if checkClientMode():
+                 logging.error('client')
+                 daemon = ManagedClient()
+             else:
+                 logging.error('server')
+                 daemon = ManagedServer()
          else:
-             logging.error('server')
-             daemon = ManagedServer()
-     else:
-         logging.error('Unsupported mode. Only managed mode is available at the moment.'
-                       )
+             logging.error('Unsupported mode. Only managed mode is available at the moment.')
+     except:
+       logging.exception('Exception launching daemon')
  
 -#        if dest:
 -#            daemon = ExternalClient()
 -#        else:
 -#            daemon = ExternalServer()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git