Added Remove_gettextutils_import.patch to un-fuck the .conf gen.

Rewritten-From: 6e3c94c4d9c5b9aab79ff67298136904b6b4dcf6

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index ccb0ac804b558ab6431eb9d31b7af97820909d86..aae27282d31d7c63a52ff95eea12d5fb99dc0cae 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -4,6 +4,7 @@ heat (2015.1~b1-1) UNRELEASED; urgency=medium
   * Reviewed (build-)depends for this release.
   * Build the heat.conf.sample on the fly at build time.
   * Refreshed allow-route-2.0.patch.
+  * Added Remove_gettextutils_import.patch to un-fuck the .conf gen.
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 24 Dec 2014 17:45:14 +0800
 

diff --git a/xenial/debian/patches/Remove_gettextutils_import.patch b/xenial/debian/patches/Remove_gettextutils_import.patch
new file mode 100644 (file)
index 0000000..7a52d73
--- /dev/null
+++ b/xenial/debian/patches/Remove_gettextutils_import.patch
@@ -0,0 +1,28 @@
+From: Tetiana Lashchova <tlashchova@mirantis.com>
+Date: Fri, 19 Dec 2014 14:19:55 +0000 (+0200)
+Subject: Remove gettextutils import
+X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fheat.git;a=commitdiff_plain;h=213ed63a240e04cdbf757a7379a69b47452113b6
+
+Remove gettextutils import
+
+Change-Id: I48846926cc5eb2a1f81db6a2becb310bdf61daa7
+Closes-Bug: #1404206
+---
+
+diff --git a/heat/openstack/common/config/generator.py b/heat/openstack/common/config/generator.py
+index 43113b3..0bf9849 100644
+--- a/heat/openstack/common/config/generator.py
++++ b/heat/openstack/common/config/generator.py
+@@ -31,12 +31,9 @@ from oslo.config import cfg
+ import six
+ import stevedore.named
+ 
+-from heat.openstack.common import gettextutils
+ from heat.common import i18n
+ from heat.openstack.common import importutils
+ 
+-gettextutils.install('heat')
+-
+ STROPT = "StrOpt"
+ BOOLOPT = "BoolOpt"
+ INTOPT = "IntOpt"

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 838c9075b2e1d0d76d88d70b257586a6da1d2cc0..c7ecce0217e5df39f97d64106407711bb5e10006 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1 +1,2 @@
 allow-route-2.0.patch
+Remove_gettextutils_import.patch