Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '604-integration'

  • Loading branch information...
commit cf3b01528efbf90b16f5ff9db6d7e4751ab97bd0 2 parents 655781c + a0d7831
@bitprophet bitprophet authored
Showing with 5 additions and 0 deletions.
  1. +3 −0  docs/changelog.rst
  2. +2 −0  fabric/sftp.py
View
3  docs/changelog.rst
@@ -25,6 +25,9 @@ would have also been included in the 1.2 line.
Changelog
=========
+* :bug:`604` Fixed wrong treatment of backslashes in put operation when uploading
+ directory tree on Windows. Thanks to @jaraco for the catch. Thanks to @dieresys
+ for the patch.
* :bug:`792` The newish `~fabric.context_managers.shell_env` context manager
was incorrectly omitted from the ``fabric.api`` import endpoint. This has
been remedied. Thanks to Vishal Rana for the catch.
View
2  fabric/sftp.py
@@ -258,6 +258,8 @@ def put_dir(self, local_path, remote_path, use_sudo, mirror_local_mode,
for context, dirs, files in os.walk(local_path):
rcontext = context.replace(strip, '', 1)
+ # normalize pathname separators with POSIX separator
+ rcontext = rcontext.replace(os.sep, '/')
rcontext = rcontext.lstrip('/')
rcontext = posixpath.join(remote_path, rcontext)
Please sign in to comment.
Something went wrong with that request. Please try again.