From 3ac86e57f4f6233f847129dd1349076a5b9a43a7 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 17 Jun 2014 16:04:50 -0500 Subject: [PATCH] FIXME comment cleanup --- lib/ansible/runner/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py index e2c3832a87..f5761ff37a 100644 --- a/lib/ansible/runner/__init__.py +++ b/lib/ansible/runner/__init__.py @@ -284,7 +284,7 @@ class Runner(object): # ***************************************************** - def _compute_environment_string(self, conn, inject=None): # CCTODO: Changed this method signature + def _compute_environment_string(self, conn, inject=None): ''' what environment variables to use when running the command? ''' enviro = {} @@ -759,9 +759,7 @@ class Runner(object): if not self.accelerate_port: self.accelerate_port = C.ACCELERATE_PORT - # CCTODO: Any reason not to do this regardless of connection type, and let the connection plugin ignore it? - if True:#actual_transport in [ 'paramiko', 'ssh', 'accelerate', 'winrm' ]: - actual_port = inject.get('ansible_ssh_port', port) + actual_port = inject.get('ansible_ssh_port', port) # the delegated host may have different SSH port configured, etc # and we need to transfer those, and only those, variables