diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-24 23:57:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-24 23:57:18 +0000 |
| commit | 75d9f5cacc9cd9b88efcc9b66c53cf2fba6a1a46 (patch) | |
| tree | b3210e85041dbbf121637f328a8ae18dc87ff34a | |
| parent | 27e6148c2975598e65a9b73aafbb9784733adbf5 (diff) | |
| parent | d074063f16fbf2dfe2b592c41c44b75476b705b7 (diff) | |
| download | oslo-75d9f5cacc9cd9b88efcc9b66c53cf2fba6a1a46.tar.gz oslo-75d9f5cacc9cd9b88efcc9b66c53cf2fba6a1a46.tar.xz oslo-75d9f5cacc9cd9b88efcc9b66c53cf2fba6a1a46.zip | |
Merge "Avoid calling sudo in install_venv_common.py."
| -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 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, |