diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py
index ec71af5fe4..59b40d1483 100644
--- a/lib/ansible/runner/__init__.py
+++ b/lib/ansible/runner/__init__.py
@@ -647,7 +647,7 @@ class Runner(object):
def _remote_md5(self, conn, tmp, path):
''' takes a remote md5sum without requiring python, and returns 0 if no file '''
- test = "rc=0; [[ -r \"%s\" ]] || rc=2; [[ -f \"%s\" ]] || rc=1" % (path,path)
+ test = "rc=0; [ -r \"%s\" ] || rc=2; [ -f \"%s\" ] || rc=1" % (path,path)
md5s = [
"(/usr/bin/md5sum %s 2>/dev/null)" % path,
"(/sbin/md5sum -q %s 2>/dev/null)" % path,
diff --git a/library/pip b/library/pip
index 162e3d08a1..775de84f20 100755
--- a/library/pip
+++ b/library/pip
@@ -19,10 +19,6 @@
# along with Ansible. If not, see .
#
-PIP = None
-VIRTUALENV = None
-ENV = None
-
def _get_full_name(name, version=None):
if version is None:
@@ -32,11 +28,11 @@ def _get_full_name(name, version=None):
return resp
-def _find_pip():
+def _find_pip(module, env):
paths = ['/usr/local/bin', '/usr/bin']
- if ENV:
- paths = [os.path.join(ENV, 'bin')] + paths
+ if env:
+ paths = [os.path.join(env, 'bin')] + paths
for p in paths:
pe = p + '/pip'
@@ -46,7 +42,7 @@ def _find_pip():
module.fail_json(msg='pip is not installed')
-def _find_virtualenv():
+def _find_virtualenv(module):
paths = ['/usr/local/bin', '/usr/bin']
for p in paths:
@@ -57,15 +53,15 @@ def _find_virtualenv():
module.fail_json(msg='virtualenv is not installed')
-def _ensure_virtualenv():
- if os.path.exists(os.path.join(ENV, 'bin', 'activate')):
+def _ensure_virtualenv(module, env, virtualenv):
+ if os.path.exists(os.path.join(env, 'bin', 'activate')):
return 0, '', ''
else:
- return _run('%s %s' % (VIRTUALENV, ENV))
+ return _run('%s %s' % (virtualenv, env))
-def _is_package_installed(name, version=None):
- rc, status_stdout, status_stderr = _run('%s freeze' % PIP)
+def _is_package_installed(name, pip, version=None):
+ rc, status_stdout, status_stderr = _run('%s freeze' % pip)
return _get_full_name(name, version).lower() in status_stdout.lower()
@@ -82,6 +78,10 @@ def _run(cmd):
def main():
+ pip = None
+ virtualenv = None
+ env = None
+
arg_spec = dict(
state=dict(default='present', choices=['absent', 'present', 'latest']),
name=dict(default=None, required=False),
@@ -96,13 +96,13 @@ def main():
err = ''
out = ''
- ENV = module.params['virtualenv']
- PIP = _find_pip()
+ env = module.params['virtualenv']
+ pip = _find_pip(module, env)
- if ENV:
- VIRTUALENV = _find_virtualenv()
+ if env:
+ virtualenv = _find_virtualenv(module)
- rc_venv, out_venv, err_venv = _ensure_virtualenv()
+ rc_venv, out_venv, err_venv = _ensure_virtualenv(module, env, virtualenv)
rc += rc_venv
out += out_venv
@@ -147,7 +147,7 @@ def main():
installed = None
if requirements:
- cmd = '%s %s -r %s --use-mirrors' % (PIP, command_map[state], requirements)
+ cmd = '%s %s -r %s --use-mirrors' % (pip, command_map[state], requirements)
rc_pip, out_pip, err_pip = _run(cmd)
rc += rc_pip
@@ -158,7 +158,7 @@ def main():
(not _did_install(out) and state == 'absent'))
if name and state == 'latest':
- cmd = '%s %s %s --upgrade' % (PIP, command_map[state], name)
+ cmd = '%s %s %s --upgrade' % (pip, command_map[state], name)
rc_pip, out_pip, err_pip = _run(cmd)
@@ -169,7 +169,7 @@ def main():
changed = 'Successfully installed' in out_pip
elif name:
- installed = _is_package_installed(name, version)
+ installed = _is_package_installed(name, pip, version)
changed = ((installed and state == 'absent') or
(not installed and state == 'present'))
@@ -180,7 +180,7 @@ def main():
else:
full_name = name
- cmd = '%s %s %s' % (PIP, command_map[state], full_name)
+ cmd = '%s %s %s' % (pip, command_map[state], full_name)
if state == 'absent':
cmd = cmd + ' -y'
@@ -197,7 +197,7 @@ def main():
module.fail_json(msg=err, cmd=cmd)
module.exit_json(changed=changed, cmd=cmd, name=name, version=version,
- state=state, requirements=requirements, virtualenv=ENV)
+ state=state, requirements=requirements, virtualenv=env)
# this is magic, see lib/ansible/module_common.py
#<>