diff options
| author | Alessio Ababilov <aababilo@yahoo-inc.com> | 2013-08-20 16:12:06 +0300 |
|---|---|---|
| committer | Alessio Ababilov <aababilo@yahoo-inc.com> | 2013-08-20 16:17:32 +0300 |
| commit | 46a07064504f8126c66797c14293a0c902166549 (patch) | |
| tree | 6a55fe3b96a6df7319096eb5fd0f147ee869c48f /tools | |
| parent | becec90286ac3fb2f2e9a1830774b4828faf5c6d (diff) | |
| download | python-keystoneclient-46a07064504f8126c66797c14293a0c902166549.tar.gz | |
Synchronize code from oslo
Use commit 376d1aaef9928a0cacb6ff8361b7b5003cad1e0a
'Merge "Update DB maintainers"'
by jenkins
on Tue Aug 20 12:08:26 2013 +0000
Changes:
- Ibf3c56e4baa6ad83e2b95a948787e9d02cf074d4 BaseException.message is deprecated since Python 2.6
- I24ffad9ab7852be44e5d6c8805aa0a47647e21cc Don't attempt to patch eventlet without the patch
- I838559f6f308e4a0c255af7bc27cdc669c5cf5f3 Ensure install_venv works behind firewalls
Change-Id: I70182bd4e6611ee6da58d2772767888608c0f80c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv_common.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index f428c1e..0999e2c 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -114,9 +114,10 @@ class InstallVenv(object): print('Installing dependencies with pip (this can take a while)...') # First things first, make sure our venv has the latest pip and - # setuptools. - self.pip_install('pip>=1.3') + # setuptools and pbr + self.pip_install('pip>=1.4') self.pip_install('setuptools') + self.pip_install('pbr') self.pip_install('-r', self.requirements) self.pip_install('-r', self.test_requirements) @@ -201,12 +202,13 @@ class Fedora(Distro): RHEL: https://bugzilla.redhat.com/958868 """ - # Install "patch" program if it's not there - if not self.check_pkg('patch'): - self.die("Please install 'patch'.") + if os.path.exists('contrib/redhat-eventlet.patch'): + # Install "patch" program if it's not there + if not self.check_pkg('patch'): + self.die("Please install 'patch'.") - # Apply the eventlet patch - self.apply_patch(os.path.join(self.venv, 'lib', self.py_version, - 'site-packages', - 'eventlet/green/subprocess.py'), - 'contrib/redhat-eventlet.patch') + # Apply the eventlet patch + self.apply_patch(os.path.join(self.venv, 'lib', self.py_version, + 'site-packages', + 'eventlet/green/subprocess.py'), + 'contrib/redhat-eventlet.patch') |