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://www.dolda2000.com/gitweb/?p=pdm.git;a=commitdiff_plain;h=578de289fa6936c1a6b21cc962b5a64d5a3a0e52

Merge branch 'master' into python3

Conflicts:
	pdm/sshsock.py
---

578de289fa6936c1a6b21cc962b5a64d5a3a0e52
diff --cc pdm/sshsock.py
index 6efaba9,dd53e6a..7ee26e8
--- a/pdm/sshsock.py
+++ b/pdm/sshsock.py
@@@ -67,10 -67,12 +67,12 @@@ 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 = ""
 -        buf2 = ""
 +        buf1 = b""
 +        buf2 = b""
          while True:
              wfd = []
              if buf1: wfd.append(sk)