[Pkg-privacy-commits] [obfsproxy] 93/353: Be more verbose on why pyptlib failed.

[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 97c7bfe86a4436a7b948b4d2b1442a1a7cd4ea82
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Dec 10 05:54:10 2012 +0200

    Be more verbose on why pyptlib failed.
    
    ...Also, improve the docs a bit.
---
 doc/HOWTO.txt               | 9 +++++++--
 obfsproxy/managed/client.py | 4 ++--
 obfsproxy/managed/server.py | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt
index f26866e..5a38488 100644
--- a/doc/HOWTO.txt
+++ b/doc/HOWTO.txt
@@ -12,12 +12,17 @@ $ git clone https://git.torproject.org/user/asn/pyptlib.git
 $ cd pyptlib && python setup.py install
 should be sufficient.
 
+You might need to run the 'python setup.py install' command as
+root. If you don't want to run it as root, you can use
+'python setup.py install --user' which will install pyptlib just for
+the current user.
+
 b)
 Now clone pyobfsproxy. You can find it here:
 https://gitweb.torproject.org/user/asn/pyobfsproxy.git
 
 Doing:
-$ sudo apt-get install python-crypto python-twisted
+$ sudo apt-get install python-crypto python-twisted python-argparse
 $ git clone https://git.torproject.org/user/asn/pyobfsproxy.git
 should do the trick.
 
@@ -37,7 +42,7 @@ Since pyobfsproxy runs it's time to point your ServerTransportPlugin
 to pyobfsproxy:
 
 """
-ServerTransportPlugin obfs2 exec /usr/bin/python /home/user/py-obfsproxy/obfsproxy.py --log-file=/home/user/alog.log --log-min-severity=info managed
+ServerTransportPlugin obfs2 exec /usr/bin/python /home/user/pyobfsproxy/obfsproxy.py --log-file=/home/user/alog.log --log-min-severity=info managed
 """
 
 This will start pyobfsproxy with 'obfs2', and will write an info-level
diff --git a/obfsproxy/managed/client.py b/obfsproxy/managed/client.py
index bad67ce..e605989 100644
--- a/obfsproxy/managed/client.py
+++ b/obfsproxy/managed/client.py
@@ -20,8 +20,8 @@ def do_managed_client():
 
     try:
         managedInfo = init(transports.transports.keys())
-    except EnvError:
-        log.warning("Client managed-proxy protocol failed.")
+    except EnvError, err:
+        log.warning("Client managed-proxy protocol failed (%s)." % err)
         return
 
     log.debug("pyptlib gave us the following data:\n'%s'", pprint.pformat(managedInfo))
diff --git a/obfsproxy/managed/server.py b/obfsproxy/managed/server.py
index 268f38e..3ebe5a5 100644
--- a/obfsproxy/managed/server.py
+++ b/obfsproxy/managed/server.py
@@ -20,8 +20,8 @@ def do_managed_server():
 
     try:
         managedInfo = init(transports.transports.keys())
-    except EnvError:
-        log.warning("Server managed-proxy protocol failed.")
+    except EnvError, err:
+        log.warning("Server managed-proxy protocol failed (%s)." % err)
         return
 
     log.debug("pyptlib gave us the following data:\n'%s'", pprint.pformat(managedInfo))

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