Blob Blame History Raw
From ffdeeec616620c94e1ba0d4a63dda79d0cbf4df0 Mon Sep 17 00:00:00 2001
From: Aravinda VK <avishwan@redhat.com>
Date: Mon, 12 Jun 2017 11:05:27 +0530
Subject: [PATCH 499/509] geo-rep: Fix string format issue caused due to #17489

With Patch #17489, values from Geo-rep config always represented
as Unicode string, which is not compatible with rest of the code.

Changed the format with this patch to fix the issue.

> Reviewed-on: https://review.gluster.org/17503
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Kotresh HR <khiremat@redhat.com>

BUG: 1448386
Change-Id: I935fca0d24f02e90757f688f92ef73fad9f9b8e1
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/108896
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 geo-replication/syncdaemon/configinterface.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geo-replication/syncdaemon/configinterface.py b/geo-replication/syncdaemon/configinterface.py
index 95c153e..a59dee7 100644
--- a/geo-replication/syncdaemon/configinterface.py
+++ b/geo-replication/syncdaemon/configinterface.py
@@ -340,7 +340,7 @@ class GConffile(object):
                 # Template expects String to be passed
                 # if any config value is not string then it
                 # fails with ValueError
-                v = u"{0}".format(v)
+                v = "{0}".format(v)
 
                 if k == '__name__':
                     continue
-- 
1.8.3.1