diff -Nru dput-0.9.2.35ubuntu2/debian/changelog dput-0.9.2.35ubuntu3/debian/changelog --- dput-0.9.2.35ubuntu2/debian/changelog 2008-11-10 16:59:49.000000000 -0400 +++ dput-0.9.2.35ubuntu3/debian/changelog 2008-11-14 10:34:16.000000000 -0400 @@ -1,3 +1,11 @@ +dput (0.9.2.35ubuntu3) jaunty; urgency=low + + * sftp.py: import bzrlib.transport inside the upload method so that dput will + not error out when bzrlib.transport is not available but the user isn't + using the sftp transport anyhow. (LP: #297851) + + -- Cody A.W. Somerville Fri, 14 Nov 2008 10:30:01 -0400 + dput (0.9.2.35ubuntu2) jaunty; urgency=low * sftp.py: Actually use the specified login name to diff -Nru /tmp/DmE6Vjmwsi/dput-0.9.2.35ubuntu2/sftp.py /tmp/VQ5cgrF8Ox/dput-0.9.2.35ubuntu3/sftp.py --- dput-0.9.2.35ubuntu2/sftp.py 2008-11-10 16:59:49.000000000 -0400 +++ dput-0.9.2.35ubuntu3/sftp.py 2008-11-14 10:26:29.000000000 -0400 @@ -7,13 +7,13 @@ import os, sys -try: - import bzrlib.transport -except Exception, e: - print "E: bzrlib must be installed to use sftp transport." - sys.exit(1) - def upload(fqdn, login, incoming, files, debug, compress, progress=0): + try: + import bzrlib.transport + except Exception, e: + print "E: bzrlib must be installed to use sftp transport." + sys.exit(1) + if not login or login == '*': login = os.getenv("USER")