* Fix Python 3 problem: run_command() returns native strings, not byte strings. * Add changelog.
This commit is contained in:
parent
a7b239708e
commit
2e5137078d
2 changed files with 4 additions and 2 deletions
2
changelogs/fragments/62621-docker_login-fix-60381.yaml
Normal file
2
changelogs/fragments/62621-docker_login-fix-60381.yaml
Normal file
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- "docker_login - correct broken fix for https://github.com/ansible/ansible/pull/60381 which crashes for Python 3."
|
|
@ -224,9 +224,9 @@ class LoginManager(DockerBaseClass):
|
|||
(rc, out, err) = self.client.module.run_command(cmd)
|
||||
if rc != 0:
|
||||
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
|
||||
elif b'Removing login credentials for ' in out:
|
||||
elif 'Removing login credentials for ' in out:
|
||||
self.results['changed'] = True
|
||||
else:
|
||||
self.client.module.warn('Unable to determine whether logout was successful.')
|
||||
|
|
Loading…
Reference in a new issue