From e42fe8565cc44eee77df8cba5634ec1760ccc27e Mon Sep 17 00:00:00 2001 From: Lorin Hochstein Date: Tue, 1 Nov 2011 15:46:24 -0400 Subject: [PATCH] Apply M2Crypto fix for all Fedora-based distributions. Broaden Fedora check to include RHEL and others. Fixes bug 884885 Change-Id: Ifab330a7f866add91d01c8cf2470e5a12fb4cd4d --- tools/install_venv.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/install_venv.py b/tools/install_venv.py index 67243fbf7c64..578908a7ec0b 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()