|
 |
21ab4e |
From b4eb53db7b9074b114e2c7327b412940ca9e26c0 Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Milind Changire <mchangir@redhat.com>
|
|
|
21ab4e |
Date: Fri, 30 Jun 2017 13:33:46 +0530
|
|
|
21ab4e |
Subject: [PATCH 539/539] tools/glusterfind: unquote DELETE path before further
|
|
|
21ab4e |
processing
|
|
|
21ab4e |
|
|
|
21ab4e |
Problem:
|
|
|
21ab4e |
DELETE path is quoted before it reaches glusterfind. This wasn't handled
|
|
|
21ab4e |
in the glusterfind code leading to double quoting of path separator
|
|
|
21ab4e |
'%2F' to '%252F' i.e. the '%' character in '%2F' itself was quoted to
|
|
|
21ab4e |
'%25'
|
|
|
21ab4e |
|
|
|
21ab4e |
Solution:
|
|
|
21ab4e |
unquote the the deleted path before further processing
|
|
|
21ab4e |
|
|
|
21ab4e |
mainline:
|
|
|
21ab4e |
> BUG: 1465024
|
|
|
21ab4e |
> Reviewed-on: https://review.gluster.org/17629
|
|
|
21ab4e |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> Reviewed-by: Aravinda VK <avishwan@redhat.com>
|
|
|
21ab4e |
(cherry picked from commit d95535bae2d200c2210feac7568b1fdbf6f545a9)
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: I2dfbbd7792dc0f9da5c8e02093b0f1c031ff344a
|
|
|
21ab4e |
BUG: 1465011
|
|
|
21ab4e |
Signed-off-by: Milind Changire <mchangir@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/110578
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
tools/glusterfind/src/changelogdata.py | 5 +++--
|
|
|
21ab4e |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/tools/glusterfind/src/changelogdata.py b/tools/glusterfind/src/changelogdata.py
|
|
|
21ab4e |
index 0e32d7b..b4a9709 100644
|
|
|
21ab4e |
--- a/tools/glusterfind/src/changelogdata.py
|
|
|
21ab4e |
+++ b/tools/glusterfind/src/changelogdata.py
|
|
|
21ab4e |
@@ -16,6 +16,7 @@ import os
|
|
|
21ab4e |
from utils import RecordType
|
|
|
21ab4e |
from utils import output_path_prepare
|
|
|
21ab4e |
|
|
|
21ab4e |
+
|
|
|
21ab4e |
class OutputMerger(object):
|
|
|
21ab4e |
"""
|
|
|
21ab4e |
Class to merge the output files collected from
|
|
|
21ab4e |
@@ -421,8 +422,8 @@ class ChangelogData(object):
|
|
|
21ab4e |
|
|
|
21ab4e |
deleted_path = data[4] if len(data) == 5 else ""
|
|
|
21ab4e |
if deleted_path != "":
|
|
|
21ab4e |
- deleted_path = output_path_prepare(deleted_path,
|
|
|
21ab4e |
- self.args)
|
|
|
21ab4e |
+ deleted_path = urllib.unquote_plus(deleted_path.encode("utf-8"))
|
|
|
21ab4e |
+ deleted_path = output_path_prepare(deleted_path, self.args)
|
|
|
21ab4e |
|
|
|
21ab4e |
if self.gfidpath_exists({"gfid": data[1], "type": "NEW",
|
|
|
21ab4e |
"pgfid1": pgfid1, "bn1": bn1}):
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|