From d074063f16fbf2dfe2b592c41c44b75476b705b7 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 22 Apr 2013 12:48:49 -0400 Subject: Avoid calling sudo in install_venv_common.py. Updates our common venv installation routine so that it no longer attempts to automatically install missing RPM packages via sudo and instead just prints an error message and dies. The primary motivation here was to avoid sudo altogether since some people would rather not have the test suite run these sorts of systems admin commands for them. Change-Id: I350e5421a4dd3094217270d39547acaea0aeda3b --- tools/install_venv_common.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'tools/install_venv_common.py') diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 4130656..f0a1722 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