[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#775923: unblock: horizon/2014.1.3-7



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear release team,

Since Moscow timezone was updated, the Horizon package FTBFS. This new version
fixes the issue by removing the +04:00 form the timezone check. The diff is
really minimal.

Please unblock horizon/2014.1.3-7 (debdiff attached).

Cheers,

Thomas Goirand (zigo)
diff -Nru horizon-2014.1.3/debian/changelog horizon-2014.1.3/debian/changelog
--- horizon-2014.1.3/debian/changelog	2014-12-10 11:43:48.000000000 +0000
+++ horizon-2014.1.3/debian/changelog	2015-01-21 14:47:35.000000000 +0000
@@ -1,3 +1,9 @@
+horizon (2014.1.3-7) unstable; urgency=medium
+
+  * Fix Moscow timezone check and avoid FTBFS (Closes: #775636).
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 21 Jan 2015 14:03:26 +0000
+
 horizon (2014.1.3-6) unstable; urgency=high
 
   * CVE-2014-8124: Horizon denial of service attack through login page. Applied
diff -Nru horizon-2014.1.3/debian/patches/fix-moscow-tz-test.patch horizon-2014.1.3/debian/patches/fix-moscow-tz-test.patch
--- horizon-2014.1.3/debian/patches/fix-moscow-tz-test.patch	1970-01-01 00:00:00.000000000 +0000
+++ horizon-2014.1.3/debian/patches/fix-moscow-tz-test.patch	2015-01-21 14:47:35.000000000 +0000
@@ -0,0 +1,20 @@
+Description: Fix Moscow tz check
+ Apparently, Moscow timezone changed from UTC+4 to UTC+3, so the test fails.
+ This patch removes the +04 check, and stops testing before that, so that the
+ check will work whatever Moscow timezone is.
+Author: Thomas Goirand <zigo@debian.org>
+Bug-Debian: https://bugs.debian.org/775636
+Forwarded: no
+Last-Update: 2014-01-21
+
+--- horizon-2014.1.3.orig/openstack_dashboard/dashboards/settings/user/tests.py
++++ horizon-2014.1.3/openstack_dashboard/dashboards/settings/user/tests.py
+@@ -29,7 +29,7 @@ class UserSettingsTest(test.TestCase):
+         res = self.client.get(INDEX_URL)
+ 
+         self.assertContains(res, "Australia/Melbourne (UTC +11:00)")
+-        self.assertContains(res, "Europe/Moscow (UTC +04:00)")
++        self.assertContains(res, "Europe/Moscow (UTC +0")
+         self.assertContains(res, "Atlantic/Stanley (UTC -03:00)")
+         self.assertContains(res, "Pacific/Honolulu (UTC -10:00)")
+ 
diff -Nru horizon-2014.1.3/debian/patches/series horizon-2014.1.3/debian/patches/series
--- horizon-2014.1.3/debian/patches/series	2014-12-10 11:43:48.000000000 +0000
+++ horizon-2014.1.3/debian/patches/series	2015-01-21 14:47:35.000000000 +0000
@@ -7,3 +7,4 @@
 disable-failed-django-1.7-test.patch
 Update_WSGI_app_creation_to_be_compatible_with_Django_1.7.patch
 CVE-2014-8124_Horizon_login_page_contains_DOS_attack_mechanism_icehouse_.patch
+fix-moscow-tz-test.patch

Reply to: