diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-08-08 12:40:10 -0300 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2013-08-08 12:40:10 -0300 |
| commit | 8719d26fd030b37dc4335e0e7e63e5b468073ebd (patch) | |
| tree | 9b0e8d79e6a2e691cd077b1cd9c0607e5ec2aac5 | |
| parent | 2fc4def480ade1da20e9d29f365ffa4b7e8415e8 (diff) | |
| download | oslo-8719d26fd030b37dc4335e0e7e63e5b468073ebd.tar.gz oslo-8719d26fd030b37dc4335e0e7e63e5b468073ebd.tar.xz oslo-8719d26fd030b37dc4335e0e7e63e5b468073ebd.zip | |
Don't attempt to patch eventlet without the patch
Some projects, like horizon, do not carry the eventlet patch.
Change-Id: I24ffad9ab7852be44e5d6c8805aa0a47647e21cc
| -rw-r--r-- | tools/install_venv_common.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 6ce5d00..0999e2c 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -202,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'.") - - # 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') + 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') |