moved pipeline check to class var that was previouslly added

This commit is contained in:
Brian Coca 2015-03-21 00:48:38 -04:00
parent b370728439
commit 9d3a63945d

View file

@ -130,10 +130,10 @@ class ActionBase:
if tmp and "tmp" in tmp: if tmp and "tmp" in tmp:
# tmp has already been created # tmp has already been created
return False 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 # tmp is necessary to store module source code
return True return True
if not self._connection._has_pipelining: if not self._connection.__class__.has_pipelining:
# tmp is necessary to store the module source code # tmp is necessary to store the module source code
# or we want to keep the files on the target system # or we want to keep the files on the target system
return True return True
@ -380,7 +380,7 @@ class ActionBase:
# FIXME: all of the old-module style and async stuff has been removed from here, and # 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 # 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) # 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 in_data = module_data
else: else:
if remote_module_path: if remote_module_path: