From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Mon, 7 Jan 2013 06:35:42 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=pdm.git;a=commitdiff_plain;h=578de289fa6936c1a6b21cc962b5a64d5a3a0e52;hp=98ecc02e068d7108325210c9fd9f510ec7bae66c

Merge branch 'master' into python3

Conflicts:
	pdm/sshsock.py
---

diff --git a/pdm/sshsock.py b/pdm/sshsock.py
index 6efaba9..7ee26e8 100644
--- 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: