]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephfs-shell: use pkg_resources rather than packaging module
authorVenky Shankar <vshankar@redhat.com>
Thu, 28 Sep 2023 07:54:35 +0000 (13:24 +0530)
committerJos Collin <jcollin@redhat.com>
Fri, 20 Oct 2023 10:46:47 +0000 (16:16 +0530)
`pkg_resources` is already being used by other py scripts.

Fixes: https://tracker.ceph.com/issues/62739
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 7f7858748d39510a0d699f91df74a17ec9f4ff3d)

src/tools/cephfs/shell/cephfs-shell

index f8e57605070050d7f5393036df32ae2aebfff16c..ec78d111c950f86b529f5647118cd0e4868bb414 100755 (executable)
@@ -16,13 +16,14 @@ import shlex
 import stat
 import errno
 
-from packaging import version
+from pkg_resources import packaging  # type: ignore
 
 from cmd2 import Cmd
 from cmd2 import __version__ as cmd2_version
 # XXX: In cmd2 versions < 1.0.1, we'll get SystemExit(2) instead of
 # Cmd2ArgparseError
-if version.parse(cmd2_version) >= version.parse("1.0.1"):
+Version = packaging.version.Version
+if Version(cmd2_version) >= Version("1.0.1"):
     from cmd2.exceptions import Cmd2ArgparseError
 else:
     # HACK: so that we don't have check for version everywhere