openstack/charm-cinder
Code Issues Proposed changes

Sync charm-helpers

Browse Source
This commit is contained in:
Corey Bryant 2015-04-23 11:55:31 +00:00
parent c7c06216fa
commit 00d2cefb30
2 changed files with 3 additions and 6 deletions
hooks/charmhelpers/contrib
openstack
utils.py
python
packages.py

4
hooks/charmhelpers/contrib/openstack/utils.py

@ -604,9 +604,9 @@ def _git_clone_and_install_single(repo, branch, parent_dir, http_proxy,
juju_log('Installing git repo from dir: {}'.format(repo_dir))
if http_proxy:
pip_install(repo_dir, ignore=True, proxy=http_proxy)
pip_install(repo_dir, proxy=http_proxy)
else:
pip_install(repo_dir, ignore=True)
pip_install(repo_dir)
return repo_dir

5
hooks/charmhelpers/contrib/python/packages.py

@ -51,7 +51,7 @@ def pip_install_requirements(requirements, **options):
pip_execute(command)
def pip_install(package, fatal=False, upgrade=False, ignore=False, **options):
def pip_install(package, fatal=False, upgrade=False, **options):
"""Install a python package"""
command = ["install"]
@ -62,9 +62,6 @@ def pip_install(package, fatal=False, upgrade=False, ignore=False, **options):
if upgrade:
command.append('--upgrade')
if ignore:
command.append('--ignore-installed')
if isinstance(package, list):
command.extend(package)
else: