cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

docker_login: fix Python 3 problem in #60381 (#62621)

Browse source 
* Fix Python 3 problem: run_command() returns native strings, not byte strings.

* Add changelog.
This commit is contained in:
Felix Fontein 2019-09-21 15:13:31 +02:00 committed by GitHub
parent a7b239708e
commit 2e5137078d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/62621-docker_login-fix-60381.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "docker_login - correct broken fix for https://github.com/ansible/ansible/pull/60381 which crashes for Python 3."

4
lib/ansible/modules/cloud/docker/docker_login.py
View file

@ -224,9 +224,9 @@ class LoginManager(DockerBaseClass):
(rc, out, err) = self.client.module.run_command(cmd) (rc, out, err) = self.client.module.run_command(cmd)
if rc != 0: if rc != 0:
self.fail("Could not log out: %s" % err) self.fail("Could not log out: %s" % err)
if b'Not logged in to ' in out: if 'Not logged in to ' in out:
self.results['changed'] = False self.results['changed'] = False
elif b'Removing login credentials for ' in out: elif 'Removing login credentials for ' in out:
self.results['changed'] = True self.results['changed'] = True
else: else:
self.client.module.warn('Unable to determine whether logout was successful.') self.client.module.warn('Unable to determine whether logout was successful.')