From 43fbf752a238076e3a9f6e3e7338203346e07492 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 11 Jan 2016 04:18:53 +0000 Subject: [PATCH] Added explicitly-declare-app_label.patch. Rewritten-From: b0baf43d95f78804c6a19d436603ae22b8891310 --- trusty/debian/changelog | 1 + .../explicitly-declare-app_label.patch | 32 +++++++++++++++++++ trusty/debian/patches/series | 1 + 3 files changed, 34 insertions(+) create mode 100644 trusty/debian/patches/explicitly-declare-app_label.patch diff --git a/trusty/debian/changelog b/trusty/debian/changelog index e7f0172..a1d21c9 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -5,6 +5,7 @@ horizon (2:8.0.0-4) unstable; urgency=medium * Added do-not-use-django.utils.unittest.patch. * Added fixed-removed-TemplateDoesNotExist.patch. * Added handle-django.forms.util-rename.patch. + * Added explicitly-declare-app_label.patch. -- Thomas Goirand Mon, 11 Jan 2016 02:54:28 +0000 diff --git a/trusty/debian/patches/explicitly-declare-app_label.patch b/trusty/debian/patches/explicitly-declare-app_label.patch new file mode 100644 index 0000000..6790533 --- /dev/null +++ b/trusty/debian/patches/explicitly-declare-app_label.patch @@ -0,0 +1,32 @@ +Description: Explicitly declares app_label +Author: Thomas Goirand +Forwarded: no +Last-Update: 2016-01-11 + +--- horizon-8.0.0.orig/horizon/test/settings.py ++++ horizon-8.0.0/horizon/test/settings.py +@@ -183,3 +183,6 @@ LOGGING = { + } + } + } ++ ++app_label = 'horizon' ++APP_LABEL = 'horizon' +--- horizon-8.0.0.orig/openstack_dashboard/local/local_settings.py.example ++++ horizon-8.0.0/openstack_dashboard/local/local_settings.py.example +@@ -664,3 +664,6 @@ REST_API_REQUIRED_SETTINGS = ['OPENSTACK + # For more information see: + # http://tinyurl.com/anticlickjack + #DISALLOW_IFRAME_EMBED = True ++ ++app_label = 'horizon' ++APP_LABEL = 'horizon' +--- horizon-8.0.0.orig/openstack_dashboard/test/settings.py ++++ horizon-8.0.0/openstack_dashboard/test/settings.py +@@ -227,3 +227,6 @@ REST_API_SETTING_2 = 'bar' + REST_API_SECURITY = 'SECURITY' + REST_API_REQUIRED_SETTINGS = ['REST_API_SETTING_1'] + REST_API_ADDITIONAL_SETTINGS = ['REST_API_SETTING_2'] ++ ++app_label = 'horizon' ++APP_LABEL = 'horizon' diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index 5a33f3e..f401dfc 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -6,3 +6,4 @@ do-not-use-django.utils.log.NullHandler.patch do-not-use-django.utils.unittest.patch fixed-removed-TemplateDoesNotExist.patch handle-django.forms.util-rename.patch +explicitly-declare-app_label.patch -- 2.45.2