Add BaseCommand.option_list-is-gone-from-django1.10.patch.

Rewritten-From: a41758f0d0a00180dac69e114d1cf121556f64a3

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 4adec5d05281fc5e08c9e2cef83c5e6cbd7a95ef..da30f59432ddc0dc77ea18002eae0b61c03a29fb 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -5,6 +5,7 @@ horizon (3:10.0.0~b2-1) experimental; urgency=medium
   * Updated Danish translation of debconf templates (Closes: #830639).
   * Remove CVE-2016-4428_Escape_angularjs_templating_in_unsafe_HTML.patch
     applied upstream.
+  * Add BaseCommand.option_list-is-gone-from-django1.10.patch.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 11 Jul 2016 14:24:50 +0200
 

diff --git a/xenial/debian/patches/BaseCommand.option_list-is-gone-from-django1.10.patch b/xenial/debian/patches/BaseCommand.option_list-is-gone-from-django1.10.patch
new file mode 100644 (file)
index 0000000..c6edc56
--- /dev/null
+++ b/xenial/debian/patches/BaseCommand.option_list-is-gone-from-django1.10.patch
@@ -0,0 +1,27 @@
+Description: [Django 1.10] BaseCommand.option_list is gone from Django 1.10
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-07-19
+
+--- horizon-10.0.0~b2.orig/openstack_dashboard/management/commands/make_web_conf.py
++++ horizon-10.0.0~b2/openstack_dashboard/management/commands/make_web_conf.py
+@@ -165,7 +165,7 @@ location you desire, e.g.::
+            'admin': context['ADMIN'],
+            'hostname': context['VHOSTNAME'], }
+ 
+-    option_list = BaseCommand.option_list + (
++    option_list = getattr(BaseCommand, 'option_list', ()) + (
+         # TODO(ygbo): Add an --nginx option.
+         make_option("-a", "--apache",
+                     default=False, action="store_true", dest="apache",
+--- horizon-10.0.0~b2.orig/openstack_dashboard/management/commands/migrate_settings.py
++++ horizon-10.0.0~b2/openstack_dashboard/management/commands/migrate_settings.py
+@@ -75,7 +75,7 @@ class DirContext(object):
+ 
+ 
+ class Command(BaseCommand):
+-    option_list = BaseCommand.option_list + (
++    option_list = getattr(BaseCommand, 'option_list', ()) + (
+         optparse.make_option(
+             '--gendiff',
+             action='store_true',

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index e883b0358c2035eff2581538e242ec72baf1c5fe..75ce97623e52dcac62df40a8cb87b4a2765fdb30 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1,3 +1,4 @@
 fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
+BaseCommand.option_list-is-gone-from-django1.10.patch