Merge branch 'master' into python3

Conflicts:
	pdm/sshsock.py

diff --git a/pdm/sshsock.py b/pdm/sshsock.py
index 6efaba9..7ee26e8 100644 (file)
--- a/pdm/sshsock.py
+++ b/pdm/sshsock.py
@@ -67,8 +67,10 @@ def cli():
             sk.connect(sys.argv[1])
         except socket.error as err:
             sys.stdout.write("SSOCK-connect: %s\n" % err)
+            sys.stdout.flush()
             return
         sys.stdout.write("SSOCK+\n")
+        sys.stdout.flush()
         buf1 = b""
         buf2 = b""
         while True: