|
 |
9ae3f9 |
From 42a05c7f8464f529f53bced31a64ea373e16f58b Mon Sep 17 00:00:00 2001
|
|
|
9ae3f9 |
From: Hari Gowtham <hgowtham@redhat.com>
|
|
|
9ae3f9 |
Date: Thu, 24 Oct 2019 17:40:44 +0530
|
|
|
9ae3f9 |
Subject: [PATCH 420/449] scripts: quota_fsck script TypeError: %d format:not
|
|
|
9ae3f9 |
dict
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
Problem: One of the prints in the script have been using
|
|
|
9ae3f9 |
%i as the format for printing which doesn't work.
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
Fix: use %s as the format in the place of %i
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
>Fixes: bz#1764129
|
|
|
9ae3f9 |
>Change-Id: I4480ede7bf62906ddedbe5f880a1e89c76946641
|
|
|
9ae3f9 |
>Signed-off-by: Hari Gowtham <hgowtham@redhat.com>
|
|
|
9ae3f9 |
>Upstream patch: https://review.gluster.org/#/c/glusterfs/+/23586/
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
BUG: 1786681
|
|
|
9ae3f9 |
Change-Id: I4480ede7bf62906ddedbe5f880a1e89c76946641
|
|
|
9ae3f9 |
Signed-off-by: hari gowtham <hgowtham@redhat.com>
|
|
|
9ae3f9 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/202484
|
|
|
9ae3f9 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
9ae3f9 |
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
|
|
|
9ae3f9 |
---
|
|
|
9ae3f9 |
extras/quota/quota_fsck.py | 4 ++--
|
|
|
9ae3f9 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
diff --git a/extras/quota/quota_fsck.py b/extras/quota/quota_fsck.py
|
|
|
9ae3f9 |
index 485a37a..174f2a2 100755
|
|
|
9ae3f9 |
--- a/extras/quota/quota_fsck.py
|
|
|
9ae3f9 |
+++ b/extras/quota/quota_fsck.py
|
|
|
9ae3f9 |
@@ -58,10 +58,10 @@ def print_msg(log_type, path, xattr_dict = {}, stbuf = "", dir_size = None):
|
|
|
9ae3f9 |
elif log_type == QUOTA_SIZE_MISMATCH:
|
|
|
9ae3f9 |
print("mismatch")
|
|
|
9ae3f9 |
if dir_size is not None:
|
|
|
9ae3f9 |
- print('%24s %60s %12s %12s' % ("Size Mismatch", path,
|
|
|
9ae3f9 |
+ print('%24s %60s %12s %12s' % ("Size Mismatch", path,
|
|
|
9ae3f9 |
xattr_dict, dir_size))
|
|
|
9ae3f9 |
else:
|
|
|
9ae3f9 |
- print('%-24s %-60s %-12i %-12i' % ("Size Mismatch", path, xattr_dict,
|
|
|
9ae3f9 |
+ print('%-24s %-60s %-12s %-12s' % ("Size Mismatch", path, xattr_dict,
|
|
|
9ae3f9 |
stbuf.st_size))
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
def size_differs_lot(s1, s2):
|
|
|
9ae3f9 |
--
|
|
|
9ae3f9 |
1.8.3.1
|
|
|
9ae3f9 |
|