Merge lp:~cbjchen/cinder/lp1514325 into lp:~ubuntu-server-dev/cinder/kilo

[Liang Chen]

SRU LP#1514325

[Sebastien Bacher (seb128)]

Thank you for the work. The bug doesn't mention if the issue is fixed in wily and xenial, could you check and update the report? Is there also a point doing a SRU for vivid now, knowing it's neither a LTS nor a current stable version...

[Liang Chen (cbjchen)]

Hi Sebastien,

Thank you for considering the merge proposal.
The code that introduces this bug was moved to an independent project(python-oslo.versionedobjects) for wily and later. So fix will need to be done there. I have backported the fix into stable/liberty branch in OpenStack upstream repository. And I can propose a SRU for ubuntu python-oslo.versionedobjects package if the fix has not been brought in. But for cinder package, nothing needs to be done for wily and later.

Thanks.
Liang

[Marc Deslauriers (mdeslaur)]

Thanks for the merge request, but since vivid is now End of Life, I am rejecting it.

review: Disapprove

Unmerged revisions

238. By lchen <<email address hidden>@canonical.com> on 2015-12-25

SRU LP: #1514325

* Fix unicode volue name error. (LP:#1514325):
  - d/p encode-repr-return.patch: ensure __repr__ return value encoded

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-16 14:48:47 +0000
+++ debian/changelog	2015-12-25 06:33:38 +0000
@@ -1,3 +1,10 @@
+cinder (1:2015.1.2-0ubuntu2) vivid; urgency=medium
+
+  * Fix unicode volue name error. (LP:#1514325):
+    - d/p encode-repr-return.patch: ensure __repr__ return value encoded
+
+ -- Liang Chen <[e-mail]>  Thu, 24 Dec 2015 09:44:29 +0000
+
 cinder (1:2015.1.2-0ubuntu1) vivid; urgency=medium
 
   [ Chuck Short ]

=== added file 'debian/patches/encode-repr-return.patch'
--- debian/patches/encode-repr-return.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/encode-repr-return.patch	2015-12-25 06:33:38 +0000
@@ -0,0 +1,47 @@
+From d9d68c7fb26b36e86641ed45356584a60b699a81 Mon Sep 17 00:00:00 2001
+From: Liang Chen <[e-mail]>
+Date: Wed, 18 Nov 2015 01:48:45 -0500
+Subject: [PATCH] Ensure__repr__ return value is encoded
+
+When __repr__ returns an unicode object, python will
+try to encode it with the default encoding scheme
+which is ascii in general. So __repr__ needs to make
+sure its return value is properly encoded.
+
+This is actually a backport from oslo.versionedobjects
+commit f5e792a9833e5139ee1f66b2ac1e55b251c42533
+
+Change-Id: I106ebbe97aa531ee48a3534f3837d5936391a2ea
+Closes-Bug: #1514325
+---
+
+Index: cinder-2015.1.2/cinder/objects/base.py
+================================================
+--- cinder-2015.1.2.orig/cinder/objects/base.py
++++ cinder-2015.1.2./cinder/objects/base.py
+@@ -24,6 +24,7 @@
+ import netaddr
+ from oslo_log import log as logging
+ import oslo_messaging as messaging
++from oslo_utils import encodeutils
+ from oslo_utils import timeutils
+ import six
+ 
+@@ -276,13 +277,16 @@
+             setattr(self, key, kwargs[key])
+ 
+     def __repr__(self):
+-        return '%s(%s)' % (
++        repr_str = '%s(%s)' % (
+             self.obj_name(),
+             ','.join(['%s=%s' % (name,
+                                  (self.obj_attr_is_set(name) and
+                                   field.stringify(getattr(self, name)) or
+                                   '<?>'))
+                       for name, field in sorted(self.fields.items())]))
++        if not six.PY3:
++            repr_str = encodeutils.safe_encode(repr_str, incoming='utf-8')
++        return repr_str
+ 
+     @classmethod
+     def obj_name(cls):

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-03-23 11:35:50 +0000
+++ debian/patches/series	2015-12-25 06:33:38 +0000
@@ -2,3 +2,4 @@
 fix-requirements.patch
 fix-long-casting.patch
 fix-assert-raises-regex-tests.patch
+encode-repr-return.patch