From 8a210d46424c2c7a20a9e8a94b0a4719df7cb8c7 Mon Sep 17 00:00:00 2001
From: Aravinda VK <avishwan@redhat.com>
Date: Fri, 26 Jun 2015 22:36:31 -0400
Subject: tools/glusterfind: RENAME and MODIFY issues

If Modification happens before RENAME, GFID to Path Conversion
converts it into New Path. Delete Modify Entry and insert again
So that MODIFY <NEW NAME> comes after RENAME.

Default value of pgfids and basenames changed to "" instead of NULL
Also fixed RENAME issue of displaying "RENAME <NEW NAME> <NEW NAME>".
Also fixed RENAME followed by missing MODIFY

Change-Id: I8202f6e6ec33f7bd921e71da38677f2ee2dab87a
BUG: 1236282
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Signed-off-by: Milind Changire <mchangir@redhat.com>
Reviewed-on: http://review.gluster.org/11443
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Aravinda VK <avishwan@redhat.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
(cherry picked from commit adc704557a141a624fc702f7303b8b81582e1598)
Reviewed-on: http://review.gluster.org/11548
Reviewed-by: Venky Shankar <vshankar@redhat.com>
---
 tools/glusterfind/src/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools/glusterfind/src/main.py')

diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py
index 8d32295a78c..9a6a2aca097 100644
--- a/tools/glusterfind/src/main.py
+++ b/tools/glusterfind/src/main.py
@@ -433,7 +433,8 @@ def mode_pre(session_dir, args):
                 # Multiple paths in case of Hardlinks
                 paths = row[1].split(",")
                 for p in paths:
-                    if p == "":
+                    if p == "" or p.replace("%2F%2F","%2F") == \
+                       row[2].replace("%2F%2F","%2F"):
                         continue
                     f.write("%s %s %s\n" % (row[0], p, row[2]))
 
-- 
cgit