diff options
| author | Chuck Short <chuck.short@canonical.com> | 2013-08-14 15:05:52 -0400 |
|---|---|---|
| committer | Chuck Short <chuck.short@canonical.com> | 2013-08-15 09:17:08 -0400 |
| commit | 626c4805595678875c5950d30926b126ab679bb8 (patch) | |
| tree | fe4d0b10898e1025d0c9dd6a228328c1bf2ab5bd /tools | |
| parent | 23ac42a43fb4859d1064e2de6f987c2ba92719a3 (diff) | |
| download | python-novaclient-626c4805595678875c5950d30926b126ab679bb8.tar.gz | |
Update oslo
Update gettext, striutils, timeutils and install_venv_common
from oslo.
Change-Id: Ibd9067e3e2be335ef75f0e4a5e4000d143030ab7
Signed-off-by: Chuck Short <chuck.short@canonical.com>
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 f428c1e0..0999e2c2 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') |