From 25c9322966f02317b16f5e85e3c16ee3f0a479ff Mon Sep 17 00:00:00 2001 From: Matthew Sherborne Date: Wed, 1 May 2013 22:39:39 +1000 Subject: Sync small and safe changes from oslo Ran the oslo-incubator sync script and brought across only the files that have small and safe changes. Change-Id: I41b400c189e52a2e7f642a03ad143d821aaa807c --- tools/install_venv_common.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'tools') 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, -- cgit