Added Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch

Rewritten-From: ef6a120137e4c501c10b25c0f79d0e9ccf64e8ca

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 7f39c6433eb5f7cd516fff5a7b4de2a9055b7348..61ba6225d305d5d03cf3a22a2b8de2f5011a093c 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,6 +1,7 @@
 horizon (2014.2-1) experimental; urgency=medium
 
   * New upstream release.
+  * Added Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch.
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 16 Oct 2014 14:56:33 +0000
 

diff --git a/trusty/debian/patches/Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch b/trusty/debian/patches/Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch
new file mode 100644 (file)
index 0000000..7cdde7f
--- /dev/null
+++ b/trusty/debian/patches/Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch
@@ -0,0 +1,37 @@
+Description: Update WSGI app creation to be compatible with Django 1.7
+ This resolves the following error when trying to run Horizon:
+ .
+ AppRegistryNotReady: The translation infrastructure cannot be initialized
+ before the apps registry is ready. Check that you don't make non-lazy gettext
+ calls at import time.
+ .
+ and is backwards-compatible with our currently supported versions (back to
+ 1.4).
+Author: Julie Pichon <jpichon@redhat.com>
+Date: Thu, 16 Oct 2014 12:46:10 +0000 (+0100)
+X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fhorizon.git;a=commitdiff_plain;h=686af384c201148c3aebcfbf18b2527587d70ea4
+Change-Id: I1e59f2bf6633a34cfe9230aa028f345e5fa70f94
+Bug-Ubuntu: https://launchpad.net/bugs/1382023
+Origin: Upstream, https://review.openstack.org/#/c/128911/
+Last-Update: 2014-10-16
+
+Index: horizon/openstack_dashboard/wsgi/django.wsgi
+===================================================================
+--- horizon.orig/openstack_dashboard/wsgi/django.wsgi
++++ horizon/openstack_dashboard/wsgi/django.wsgi
+@@ -1,7 +1,7 @@
+ import logging
+ import os
+ import sys
+-import django.core.handlers.wsgi
++from django.core.wsgi import get_wsgi_application
+ from django.conf import settings
+ 
+ # Add this file path to sys.path in order to import settings
+@@ -13,5 +13,4 @@ sys.path.append("/usr/share/openstack-da
+ 
+ DEBUG = False
+ 
+-application = django.core.handlers.wsgi.WSGIHandler()
+-
++application = get_wsgi_application()

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 1347e5d5c3750f9b4f168cff4882786b490f5888..3bc0b2ba0283d98321f6d258b224d9003d1a7b31 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -3,3 +3,4 @@ fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
 disable-failed-django-1.7-test.patch
 Remove_selenium_dependency_when_not_using_selenium_tests.patch
+Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch