Skip to content

Commit ef35100

Browse files
committed
Merge PR ceph#58327 into main
* refs/pull/58327/head: cephfs-shell: excute cmd 'rmdir_helper' reported error Reviewed-by: Rishabh Dave <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]> Reviewed-by: Jos Collin <[email protected]>
2 parents f4083b7 + d8c3c45 commit ef35100

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/tools/cephfs/shell/cephfs-shell

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,9 +1014,9 @@ class CephFSShell(Cmd):
10141014

10151015
@with_argparser(rmdir_parser)
10161016
def do_rmdir(self, args):
1017-
self.do_rmdir_helper(args)
1017+
self._rmdir(args)
10181018

1019-
def do_rmdir_helper(self, args):
1019+
def _rmdir(self, args):
10201020
"""
10211021
Remove a specific Directory
10221022
"""
@@ -1532,7 +1532,7 @@ class CephFSShell(Cmd):
15321532
try:
15331533
if is_dir_exists(snap_dir):
15341534
newargs = argparse.Namespace(paths=[snap_dir], parent=False)
1535-
self.do_rmdir_helper(newargs)
1535+
self._rmdir(newargs)
15361536
else:
15371537
set_exit_code_msg(errno.ENOENT, "'{}': no such snapshot".format(
15381538
args.name.decode('utf-8')))

0 commit comments

Comments
 (0)