[Checkins] SVN: zc.buildoutsftp/branches/dev/ Fixed a bug in handling multiple user keys.

[Jim Fulton]

Log message for revision 73201:
  Fixed a bug in handling multiple user keys.
  

Changed:
  U   zc.buildoutsftp/branches/dev/CHANGES.txt
  U   zc.buildoutsftp/branches/dev/setup.py
  U   zc.buildoutsftp/branches/dev/src/zc/buildoutsftp/urllib2sftp.py

-=-
Modified: zc.buildoutsftp/branches/dev/CHANGES.txt
===================================================================
--- zc.buildoutsftp/branches/dev/CHANGES.txt	2007-03-15 18:33:21 UTC (rev 73200)
+++ zc.buildoutsftp/branches/dev/CHANGES.txt	2007-03-15 18:51:12 UTC (rev 73201)
@@ -5,6 +5,11 @@
 testing. I'm still trying to figure out how to write automated tests
 for this.
 
+0.2.1
+-----
+
+Fixed a bug in handling multiple user keys.
+
 0.2
 ---
 

Modified: zc.buildoutsftp/branches/dev/setup.py
===================================================================
--- zc.buildoutsftp/branches/dev/setup.py	2007-03-15 18:33:21 UTC (rev 73200)
+++ zc.buildoutsftp/branches/dev/setup.py	2007-03-15 18:51:12 UTC (rev 73201)
@@ -3,7 +3,7 @@
 name='zc.buildoutsftp'
 setup(
     name=name,
-    version = "0.2",
+    version = "0.2.1",
     author = "Jim Fulton",
     author_email = "jim at zope.com",
     description =

Modified: zc.buildoutsftp/branches/dev/src/zc/buildoutsftp/urllib2sftp.py
===================================================================
--- zc.buildoutsftp/branches/dev/src/zc/buildoutsftp/urllib2sftp.py	2007-03-15 18:33:21 UTC (rev 73200)
+++ zc.buildoutsftp/branches/dev/src/zc/buildoutsftp/urllib2sftp.py	2007-03-15 18:51:12 UTC (rev 73201)
@@ -106,16 +106,17 @@
         [hostkeytype] = list(hostkey)
         hostkey = hostkey[hostkeytype]
 
-        trans = paramiko.Transport((host, port))
         if pw is not None:
+            trans = paramiko.Transport((host, port))
             trans.connect(username=user, password=pw)
         else:
             for key in paramiko.Agent().get_keys():
+                trans = paramiko.Transport((host, port))
                 try:
                     trans.connect(username=user, pkey=key, hostkey=hostkey)
                     break
                 except paramiko.AuthenticationException:
-                    pass                
+                    trans.close()                
             else:
                 raise paramiko.AuthenticationException(
                     "Authentication failed.")