From 1adb6dfa051498b70ac34b4ac12524952c126149 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Tue, 24 Jun 2014 10:45:11 -0500 Subject: [PATCH] Remove redundant 'self.user or' added by 0f91add --- lib/ansible/runner/connection_plugins/ssh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/runner/connection_plugins/ssh.py b/lib/ansible/runner/connection_plugins/ssh.py index bddbd88af34..ca6fdb3a6ff 100644 --- a/lib/ansible/runner/connection_plugins/ssh.py +++ b/lib/ansible/runner/connection_plugins/ssh.py @@ -94,7 +94,7 @@ class Connection(object): self.common_args += ["-o", "KbdInteractiveAuthentication=no", "-o", "PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey", "-o", "PasswordAuthentication=no"] - self.common_args += ["-o", "User=" + (self.user or self.user or pwd.getpwuid(os.geteuid())[0])] + self.common_args += ["-o", "User=" + (self.user or pwd.getpwuid(os.geteuid())[0])] self.common_args += ["-o", "ConnectTimeout=%d" % self.runner.timeout] return self