diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-01 17:09:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-01 17:09:59 +0000 |
| commit | 08968d255df65a0a290dabcc5c8d63d5b7d2bca4 (patch) | |
| tree | 4aa5832661d8fa1152defd6588e438b1556f88f9 /tools | |
| parent | 92c974d987a561048e97f109db745944370cb0e7 (diff) | |
| parent | 25c9322966f02317b16f5e85e3c16ee3f0a479ff (diff) | |
| download | nova-08968d255df65a0a290dabcc5c8d63d5b7d2bca4.tar.gz nova-08968d255df65a0a290dabcc5c8d63d5b7d2bca4.tar.xz nova-08968d255df65a0a290dabcc5c8d63d5b7d2bca4.zip | |
Merge "Sync small and safe changes from oslo"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv_common.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 413065640..f0a1722c3 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -180,10 +180,6 @@ class Fedora(Distro): return self.run_command_with_code(['rpm', '-q', pkg], check_exit_code=False)[1] == 0 - def yum_install(self, pkg, **kwargs): - print "Attempting to install '%s' via yum" % pkg - self.run_command(['sudo', 'yum', 'install', '-y', pkg], **kwargs) - def apply_patch(self, originalfile, patchfile): self.run_command(['patch', '-N', originalfile, patchfile], check_exit_code=False) @@ -193,7 +189,7 @@ class Fedora(Distro): return if not self.check_pkg('python-virtualenv'): - self.yum_install('python-virtualenv', check_exit_code=False) + self.die("Please install 'python-virtualenv'.") super(Fedora, self).install_virtualenv() @@ -211,7 +207,7 @@ class Fedora(Distro): # Install "patch" program if it's not there if not self.check_pkg('patch'): - self.yum_install('patch') + self.die("Please install 'patch'.") # Apply the eventlet patch self.apply_patch(os.path.join(self.venv, 'lib', self.py_version, |