File 0001-Avoid-message-concatenation-in-error-path.patch of Package python-keystoneclient.1737

From bf8eac535b3b44a0f73f8181936ff5f0019fde2d Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Fri, 13 Feb 2015 15:34:47 +0100
Subject: [PATCH] Avoid message concatenation in error path

Recently, the error message in _process_communicate_handle_oserror()
has been i18n'ed, which caused the regression as another code path
appended a string to it, which causes the TypeError to be raised.

Since if the Python 2.6 bug happens there is no stderr available,
we can rework the condition to only read it if there was no
(simulated) error from _process_communicate_handle_oserror(), avoiding
the issue.

Closes-Bug: 1421652

Change-Id: I7229b46888f798ac4a69c140ab389afed49b8c3c
---
 keystoneclient/common/cms.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: python-keystoneclient-1.0.0/keystoneclient/common/cms.py
===================================================================
--- python-keystoneclient-1.0.0.orig/keystoneclient/common/cms.py
+++ python-keystoneclient-1.0.0/keystoneclient/common/cms.py
@@ -106,9 +106,8 @@ def _process_communicate_handle_oserror(
         # The quick exit is typically caused by the openssl command not being
         # able to read an input file, so check ourselves if can't read a file.
         retcode, err = _check_files_accessible(files)
-        if process.stderr:
-            msg = process.stderr.read()
-            err = err + msg.decode('utf-8')
+        if err is None:
+            err = process.stderr.read().decode('utf-8')
         output = ''
     else:
         retcode = process.poll()