diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-15 23:36:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-15 23:36:05 +0000 |
| commit | 7ece1e7e607849f0d9a0eb5551899b3cc973545e (patch) | |
| tree | 958590ad7459e39964ad360ccd4e703b46566775 | |
| parent | 9f3f056bd5ceda5d41508533244f5b509ddcfb0e (diff) | |
| parent | b0ad7284aa6e00559efa6e291b69eef1a2a1de33 (diff) | |
Merge "install_venv: apply eventlet patch correctly with python 2.7 (#890461)"
| -rw-r--r-- | tools/install_venv.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py index 166801e82..f1d2ea86c 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -110,6 +110,9 @@ class Fedora(Distro): def yum_install(self, pkg, **kwargs): run_command(['sudo', 'yum', 'install', '-y', pkg], **kwargs) + def apply_patch(self, originalfile, patchfile): + run_command(['patch', originalfile, patchfile]) + def install_virtualenv(self): if self.check_cmd('virtualenv'): return @@ -143,9 +146,9 @@ class Fedora(Distro): self.yum_install('patch') # Apply the eventlet patch - run_command(['patch', - '.nova-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py', - 'contrib/redhat-eventlet.patch']) + self.apply_patch(os.path.join(VENV, 'lib', PY_VERSION, 'site-packages', + 'eventlet/green/subprocess.py'), + 'contrib/redhat-eventlet.patch') def get_distro(): |