Skip to content

Commit e43c155

Browse files
Merge pull request ceph#55711 from rishabh-d-dave/fsshell-deprecation
cephfs-shell: prints warning, hangs and aborts when launched Reviewed-by: Jos Collin <jcollin@redhat.com> Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>
2 parents 84a316c + 68b5766 commit e43c155

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/tools/cephfs/shell/cephfs-shell

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ import shlex
1616
import stat
1717
import errno
1818

19-
from pkg_resources import packaging # type: ignore
20-
2119
from cmd2 import Cmd
2220
from cmd2 import __version__ as cmd2_version
21+
from packaging.version import Version
22+
2323
# XXX: In cmd2 versions < 1.0.1, we'll get SystemExit(2) instead of
2424
# Cmd2ArgparseError
25-
Version = packaging.version.Version
2625
if Version(cmd2_version) >= Version("1.0.1"):
2726
from cmd2.exceptions import Cmd2ArgparseError
2827
else:

0 commit comments

Comments
 (0)