From dbbd6cf1079ef46de3e9ec11db0eb824a3875099 Mon Sep 17 00:00:00 2001
From: Adrian Smith <adrian_f_smith@dell.com>
Date: Mon, 28 Nov 2011 21:24:47 +0000
Subject: Use system M2Crypto package on Oneiric, bug 892271

Ubuntu Oneiric has a problem with the pip installed version of m2crypto.
This fix installs python-m2crypto via apt-get on Oneiric.

Change-Id: I8290a74b614eb0d0b8d620dbad19d2cc6843de8b
---
 tools/install_venv.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/install_venv.py b/tools/install_venv.py
index f1d2ea86c..e5279a840 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -27,6 +27,7 @@ import optparse
 import os
 import subprocess
 import sys
+import platform
 
 
 ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
@@ -98,6 +99,17 @@ class Distro(object):
         pass
 
 
+class UbuntuOneiric(Distro):
+    """Oneiric specific installation steps"""
+
+    def install_m2crypto(self):
+        """
+        The pip installed version of m2crypto has problems on oneiric
+        """
+        run_command(['sudo', 'apt-get', 'install', '-y',
+            "python-m2crypto"])
+
+
 class Fedora(Distro):
     """This covers all Fedora-based distributions.
 
@@ -155,6 +167,8 @@ def get_distro():
     if os.path.exists('/etc/fedora-release') or \
        os.path.exists('/etc/redhat-release'):
         return Fedora()
+    elif platform.linux_distribution()[2] == 'oneiric':
+        return UbuntuOneiric()
     else:
         return Distro()
 
-- 
cgit