From 9d3a63945d7ca11a024409b20f010d48b157605d Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Sat, 21 Mar 2015 00:48:38 -0400 Subject: [PATCH] moved pipeline check to class var that was previouslly added --- v2/ansible/plugins/action/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/ansible/plugins/action/__init__.py b/v2/ansible/plugins/action/__init__.py index d430bd748be..e5600302158 100644 --- a/v2/ansible/plugins/action/__init__.py +++ b/v2/ansible/plugins/action/__init__.py @@ -130,10 +130,10 @@ class ActionBase: if tmp and "tmp" in tmp: # tmp has already been created return False - if not self._connection._has_pipelining or not C.ANSIBLE_SSH_PIPELINING or C.DEFAULT_KEEP_REMOTE_FILES or self._connection_info.become: + if not self._connection.__class__.has_pipelining or not C.ANSIBLE_SSH_PIPELINING or C.DEFAULT_KEEP_REMOTE_FILES or self._connection_info.become: # tmp is necessary to store module source code return True - if not self._connection._has_pipelining: + if not self._connection.__class__.has_pipelining: # tmp is necessary to store the module source code # or we want to keep the files on the target system return True @@ -380,7 +380,7 @@ class ActionBase: # FIXME: all of the old-module style and async stuff has been removed from here, and # might need to be re-added (unless we decide to drop support for old-style modules # at this point and rework things to support non-python modules specifically) - if self._connection._has_pipelining and C.ANSIBLE_SSH_PIPELINING and not C.DEFAULT_KEEP_REMOTE_FILES: + if self._connection.__class__.has_pipelining and C.ANSIBLE_SSH_PIPELINING and not C.DEFAULT_KEEP_REMOTE_FILES: in_data = module_data else: if remote_module_path: