From fdfae1c00c0059a03389bdcfafa6b0ee8d95ad55 Mon Sep 17 00:00:00 2001 From: Shyamsundar Ranganathan Date: Wed, 5 Aug 2020 11:19:26 -0400 Subject: [PATCH] mgr: Add python-enum34 dependency to package for older distributions Subvolumes v2 introduces Enum usage, that is not part of python<=3.4 and is provided as an extra package python-enum34 till python 2.4 version. Added this as an explicit dependency to packaging, to ensure it is installed in required distributions. python-enum34 is also used by mgr-dashboard (src/pybind/mgr/dashboard/plugins/feature_toggles.py) but the dependency is not called out explicitly and is satisfied by, python-pyopenssl, which depends on python-cryptography, which depends on python-enum34. Platform availability notes: - centos7 comes with python-enum34 - centos8 does not require this, as python versions are higher, and Enum is part of the language itself - openSUSE 15.1/2 comes with python-enum34 - Ubuntu Xenial/Bionic comes with python-enum34 Signed-off-by: Shyamsundar Ranganathan --- ceph.spec.in | 3 +++ debian/control | 1 + 2 files changed, 4 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index 046111ada94b1..8a77bc2ca63c8 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -481,6 +481,9 @@ Requires: pyOpenSSL %else Requires: python%{_python_buildid}-pyOpenSSL %endif +%if 0%{?rhel} < 8 || 0%{?suse_version} +Requires: python-enum34 +%endif %description mgr ceph-mgr enables python modules that provide services (such as the REST module derived from Calamari) and expose CLI hooks. ceph-mgr gathers diff --git a/debian/control b/debian/control index 111724e8dc4de..412c6a0538d92 100644 --- a/debian/control +++ b/debian/control @@ -186,6 +186,7 @@ Architecture: linux-any Depends: ceph-base (= ${binary:Version}), python-bcrypt, python-cherrypy3, + python-enum34, python-jwt, python-openssl, python-pecan, -- 2.47.3