diff options
| author | Lorin Hochstein <lorin@isi.edu> | 2011-11-01 15:46:24 -0400 |
|---|---|---|
| committer | Lorin Hochstein <lorin@isi.edu> | 2011-11-09 14:54:16 -0500 |
| commit | e42fe8565cc44eee77df8cba5634ec1760ccc27e (patch) | |
| tree | 20efc4100abc4a1ff08c8db17c870a398ea020cc | |
| parent | 9088c89a54222d187978dd1576651c5959fa98a9 (diff) | |
| download | nova-e42fe8565cc44eee77df8cba5634ec1760ccc27e.tar.gz nova-e42fe8565cc44eee77df8cba5634ec1760ccc27e.tar.xz nova-e42fe8565cc44eee77df8cba5634ec1760ccc27e.zip | |
Apply M2Crypto fix for all Fedora-based distributions.
Broaden Fedora check to include RHEL and others.
Fixes bug 884885
Change-Id: Ifab330a7f866add91d01c8cf2470e5a12fb4cd4d
| -rw-r--r-- | tools/install_venv.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py index 67243fbf7..578908a7e 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -92,6 +92,9 @@ class Distro(object): class Fedora(Distro): + """This covers all Fedora-based distributions. + + Includes: Fedora, RHEL, CentOS, Scientific Linux""" def check_pkg(self, pkg): return run_command_with_code(['rpm', '-q', pkg], @@ -119,7 +122,8 @@ class Fedora(Distro): def get_distro(): - if os.path.exists('/etc/fedora-release'): + if os.path.exists('/etc/fedora-release') or \ + os.path.exists('/etc/redhat-release'): return Fedora() else: return Distro() |