diff options
| author | Toshio Kuratomi <toshio@fedoraproject.org> | 2016-01-06 15:18:22 -0800 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2016-01-06 15:19:40 -0800 |
| commit | 46903c80faaf2a73056e7b9fbd52085291b4931f (patch) | |
| tree | 9b429b10c16e682118abc6d19be50ed870d24601 /lib/ansible/plugins/connection/docker.py | |
| parent | 669b311dbebbd1d226a637181d318e50b85dc911 (diff) | |
| download | ansible-46903c80faaf2a73056e7b9fbd52085291b4931f.tar.gz | |
More fixes for unicode handling in the connection plugins.
Tested that ssh, docker, local, lxc-libvirt, chroot all work with the
updated unicode integration test.
Diffstat (limited to 'lib/ansible/plugins/connection/docker.py')
| -rw-r--r-- | lib/ansible/plugins/connection/docker.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/plugins/connection/docker.py b/lib/ansible/plugins/connection/docker.py index ce556a1431..130317f24a 100644 --- a/lib/ansible/plugins/connection/docker.py +++ b/lib/ansible/plugins/connection/docker.py @@ -113,7 +113,7 @@ class Connection(ConnectionBase): """ Connect to the container. Nothing to do """ super(Connection, self)._connect() if not self._connected: - display.vvv("ESTABLISH DOCKER CONNECTION FOR USER: {0}".format( + display.vvv(u"ESTABLISH DOCKER CONNECTION FOR USER: {0}".format( self._play_context.remote_user, host=self._play_context.remote_addr) ) self._connected = True @@ -172,7 +172,7 @@ class Connection(ConnectionBase): # running containers, so we use docker exec to implement this executable = C.DEFAULT_EXECUTABLE.split()[0] if C.DEFAULT_EXECUTABLE else '/bin/sh' args = [self.docker_cmd, "exec", "-i", self._play_context.remote_addr, executable, "-c", - "dd of={0} bs={1}".format(out_path, BUFSIZE)] + "dd of=%s bs=%s" % (out_path, BUFSIZE)] args = map(to_bytes, args) with open(in_path, 'rb') as in_file: try: |