|
 |
21ab4e |
From ffdeeec616620c94e1ba0d4a63dda79d0cbf4df0 Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Aravinda VK <avishwan@redhat.com>
|
|
|
21ab4e |
Date: Mon, 12 Jun 2017 11:05:27 +0530
|
|
|
21ab4e |
Subject: [PATCH 499/509] geo-rep: Fix string format issue caused due to #17489
|
|
|
21ab4e |
|
|
|
21ab4e |
With Patch #17489, values from Geo-rep config always represented
|
|
|
21ab4e |
as Unicode string, which is not compatible with rest of the code.
|
|
|
21ab4e |
|
|
|
21ab4e |
Changed the format with this patch to fix the issue.
|
|
|
21ab4e |
|
|
|
21ab4e |
> Reviewed-on: https://review.gluster.org/17503
|
|
|
21ab4e |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> Reviewed-by: Kotresh HR <khiremat@redhat.com>
|
|
|
21ab4e |
|
|
|
21ab4e |
BUG: 1448386
|
|
|
21ab4e |
Change-Id: I935fca0d24f02e90757f688f92ef73fad9f9b8e1
|
|
|
21ab4e |
Signed-off-by: Aravinda VK <avishwan@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/108896
|
|
|
21ab4e |
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
geo-replication/syncdaemon/configinterface.py | 2 +-
|
|
|
21ab4e |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/geo-replication/syncdaemon/configinterface.py b/geo-replication/syncdaemon/configinterface.py
|
|
|
21ab4e |
index 95c153e..a59dee7 100644
|
|
|
21ab4e |
--- a/geo-replication/syncdaemon/configinterface.py
|
|
|
21ab4e |
+++ b/geo-replication/syncdaemon/configinterface.py
|
|
|
21ab4e |
@@ -340,7 +340,7 @@ class GConffile(object):
|
|
|
21ab4e |
# Template expects String to be passed
|
|
|
21ab4e |
# if any config value is not string then it
|
|
|
21ab4e |
# fails with ValueError
|
|
|
21ab4e |
- v = u"{0}".format(v)
|
|
|
21ab4e |
+ v = "{0}".format(v)
|
|
|
21ab4e |
|
|
|
21ab4e |
if k == '__name__':
|
|
|
21ab4e |
continue
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|