RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 09:27:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #24508 into master

Browse Source 
* refs/pull/24508/head:
	cephfs-shell: fixup 'str' object has no attribute 'decode'

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2018-10-15 21:12:56 -07:00
commit 14f23d602b
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/cephfs/cephfs-shell
View File

@ -568,8 +568,7 @@ exists.')
items = sorted(list_items(dir_name),
key=lambda item: item.d_name)
if not args.all and len(items) > 2:
items = [i for i in items if not i.d_name.decode(
'utf-8').startswith('.')]
items = [i for i in items if not i.d_name.startswith('.')]
flag = 0
if args.S:
items = sorted(items, key=lambda item: cephfs.stat(
@ -579,7 +578,7 @@ exists.')
for item in items:
path = item
if not isinstance(item, str):
path = item.d_name.decode('utf-8')
path = item.d_name
if item.is_dir():
is_dir = True
else: