From d617cd177717232701d1b9f50ae61cfb297d6264 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 9 Apr 2018 14:52:35 +1000
Subject: [PATCH] Use earlier six release

As described, the code is incompatible with the latest six.  Pin this
till we can update the underlying django, etc.

Change-Id: Ic13b80ba53331f5375cbb35ddf86880313415332
---
 manifests/install.pp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/manifests/install.pp b/manifests/install.pp
index 861c4c2..d96a2c5 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -111,6 +111,16 @@ class askbot::install (
     require    => Exec[ 'pip-requirements-install' ],
   }
 
+  # six 1.11.0 fails with this old django,
+  # use an earlier one; see
+  #  https://github.com/benjaminp/six/issues/210
+  python::pip { 'six':
+    ensure     => '1.10.0',
+    pkgname    => 'six',
+    virtualenv => '/usr/askbot-env',
+    require    => Python::Virtualenv['/usr/askbot-env'],
+  }
+
   include ::httpd::mod::wsgi
 
   exec { 'askbot-install':
@@ -123,6 +133,7 @@ class askbot::install (
     require     => [
       Python::Virtualenv['/usr/askbot-env'],
       Exec[ 'pip-requirements-install' ],
+      Python::Pip[ 'six' ],
       Python::Pip[ 'stopforumspam' ],
       Python::Pip[ 'captcha' ],
       ],