From: Thomas Goirand Date: Tue, 10 Feb 2015 14:55:13 +0000 (+0100) Subject: Removed debian/patches/Remove_gettextutils_import.patch X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4c73dd40bd02baa6da61140850ca2cabdf7ccce8;p=openstack-build%2Fheat-build.git Removed debian/patches/Remove_gettextutils_import.patch Rewritten-From: 5b03a0e621620dab6b4453a7ec34e47d884b4909 --- diff --git a/trusty/debian/patches/Remove_gettextutils_import.patch b/trusty/debian/patches/Remove_gettextutils_import.patch deleted file mode 100644 index 3031a05d..00000000 --- a/trusty/debian/patches/Remove_gettextutils_import.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Remove gettextutils import -Author: Tetiana Lashchova -Date: Fri, 19 Dec 2014 14:19:55 +0000 (+0200) -X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fheat.git;a=commitdiff_plain;h=213ed63a240e04cdbf757a7379a69b47452113b6 -Change-Id: I48846926cc5eb2a1f81db6a2becb310bdf61daa7 -Bug-Ubuntu: https://bugs.launchpad.net/heat/+bug/1404206 -Origin: Upstream, https://review.openstack.org/#/c/143096/ -Last-Update: 2014-12-31 - -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/trusty/debian/patches/series b/trusty/debian/patches/series index c7ecce02..838c9075 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -1,2 +1 @@ allow-route-2.0.patch -Remove_gettextutils_import.patch