|
 |
ca3909 |
From 6c06ac0571fb6bf0734b173cc3a75badc7554601 Mon Sep 17 00:00:00 2001
|
|
|
ca3909 |
From: Shwetha K Acharya <sacharya@redhat.com>
|
|
|
ca3909 |
Date: Tue, 14 Jan 2020 10:51:06 +0530
|
|
|
ca3909 |
Subject: [PATCH 350/350] tools/glusterfind: Remove an extra argument
|
|
|
ca3909 |
|
|
|
ca3909 |
Backport of:
|
|
|
ca3909 |
> Upstream Patch: https://review.gluster.org/#/c/glusterfs/+/24011/
|
|
|
ca3909 |
> fixes: bz#1790748
|
|
|
ca3909 |
> Change-Id: I1cb12c975142794139456d0f8e99fbdbb03c53a1
|
|
|
ca3909 |
> Signed-off-by: Shwetha K Acharya <sacharya@redhat.com>
|
|
|
ca3909 |
|
|
|
ca3909 |
Change-Id: I1cb12c975142794139456d0f8e99fbdbb03c53a1
|
|
|
ca3909 |
BUG: 1789447
|
|
|
ca3909 |
Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
|
|
|
ca3909 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/189363
|
|
|
ca3909 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
ca3909 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
ca3909 |
---
|
|
|
ca3909 |
tools/glusterfind/src/main.py | 2 +-
|
|
|
ca3909 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
ca3909 |
|
|
|
ca3909 |
diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py
|
|
|
ca3909 |
index dfc9d07..5ca1fec 100644
|
|
|
ca3909 |
--- a/tools/glusterfind/src/main.py
|
|
|
ca3909 |
+++ b/tools/glusterfind/src/main.py
|
|
|
ca3909 |
@@ -515,7 +515,7 @@ def write_output(outfile, outfilemerger, field_separator):
|
|
|
ca3909 |
continue
|
|
|
ca3909 |
|
|
|
ca3909 |
if row_2_rep and row_2_rep != "":
|
|
|
ca3909 |
- gfind_write_row(f, row[0], field_separator, p_rep, field_separator, row_2_rep)
|
|
|
ca3909 |
+ gfind_write_row(f, row[0], field_separator, p_rep, row_2_rep)
|
|
|
ca3909 |
|
|
|
ca3909 |
else:
|
|
|
ca3909 |
gfind_write(f, row[0], field_separator, p_rep)
|
|
|
ca3909 |
--
|
|
|
ca3909 |
1.8.3.1
|
|
|
ca3909 |
|