diff -Nru openstack-trove-5.1.1/debian/changelog openstack-trove-5.1.1/debian/changelog --- openstack-trove-5.1.1/debian/changelog 2016-09-27 19:26:33.000000000 +0000 +++ openstack-trove-5.1.1/debian/changelog 2016-10-27 15:42:56.000000000 +0000 @@ -1,3 +1,10 @@ +openstack-trove (1:5.1.1-0ubuntu2) xenial; urgency=medium + + * d/p/add-missing-import.patch: Cherry-pick patch from upstream + to add missing '_LE' import for trove-guestagent (LP: #1620888). + + -- Corey Bryant Thu, 27 Oct 2016 17:42:56 +0200 + openstack-trove (1:5.1.1-0ubuntu1) xenial; urgency=medium * New upstream point release for OpenStack Mitaka (LP: #1619318). diff -Nru openstack-trove-5.1.1/debian/patches/add-missing-import.patch openstack-trove-5.1.1/debian/patches/add-missing-import.patch --- openstack-trove-5.1.1/debian/patches/add-missing-import.patch 1970-01-01 00:00:00.000000000 +0000 +++ openstack-trove-5.1.1/debian/patches/add-missing-import.patch 2016-10-27 15:42:56.000000000 +0000 @@ -0,0 +1,29 @@ +From e428d76ace2e21d83991243ad00b4951ae05da6a Mon Sep 17 00:00:00 2001 +From: "Chaozhe.Chen" +Date: Wed, 7 Sep 2016 10:37:36 +0800 +Subject: [PATCH] Add missing '_LE' import in trove/cmd/guest.py + +Global name '_LE' was missing in trove/cmd/guest.py. This patch +adds this missing import. + +Change-Id: Ia0b4ecb27f0f4dcae88a56288bc5052f1afa63e8 +Closes-Bug: #1620888 +--- + trove/cmd/guest.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/trove/cmd/guest.py b/trove/cmd/guest.py +index 36a9f01..f866f3b 100644 +--- a/trove/cmd/guest.py ++++ b/trove/cmd/guest.py +@@ -24,6 +24,7 @@ from oslo_service import service as openstack_service + + from trove.common import cfg + from trove.common import debug_utils ++from trove.common.i18n import _LE + + CONF = cfg.CONF + # The guest_id opt definition must match the one in common/cfg.py +-- +2.9.3 + diff -Nru openstack-trove-5.1.1/debian/patches/series openstack-trove-5.1.1/debian/patches/series --- openstack-trove-5.1.1/debian/patches/series 2016-09-27 19:26:33.000000000 +0000 +++ openstack-trove-5.1.1/debian/patches/series 2016-10-27 15:42:56.000000000 +0000 @@ -1,3 +1,4 @@ +add-missing-import.patch skip-failing-tests.patch skip-tests.patch fix-base-unit-test-class.patch