PR#50721: Issue 50712 - Version comparison doesn't work correctly on git builds - 389-ds-base

389-ds-base

#50721 Issue 50712 - Version comparison doesn't work correctly on git builds

Closed 3 years ago by spichugi. Opened 4 years ago by vashirov.

vashirov/389-ds-base semver into master

Issue 50712 - Version comparison doesn't work correctly on git builds

Viktor Ashirov • 4 years ago

6d70cbe

rpm/389-ds-base.spec.in

file modified

+1 -2

		`@@ -130,7 +130,6 @@`
		`BuildRequires: python%{python3_pkgversion}-argparse-manpage`
		`BuildRequires: python%{python3_pkgversion}-policycoreutils`
		`BuildRequires: python%{python3_pkgversion}-libselinux`
		`- BuildRequires: python%{python3_pkgversion}-packaging`

		`# For cockpit`
		`BuildRequires: rsync`
		`@@ -303,7 +302,7 @@`
		`Requires: python%{python3_pkgversion}-dateutil`
		`Requires: python%{python3_pkgversion}-argcomplete`
		`Requires: python%{python3_pkgversion}-libselinux`
		`- Requires: python%{python3_pkgversion}-packaging`
		`+ Requires: python%{python3_pkgversion}-setuptools`
		`%{?python_provide:%python_provide python%{python3_pkgversion}-lib389}`

		`%description -n python%{python3_pkgversion}-lib389`

src/lib389/lib389/tests/utils_test.py

file modified

+29

		`@@ -145,6 +145,35 @@`
		`assert display_log_data(before) == after`


		`+ @pytest.mark.parametrize('ds_ver, cmp_ver', [`
		`+ ('1.3.1', '1.3.2'),`
		`+ ('1.3.1', '1.3.10'),`
		`+ ('1.3.2', '1.3.10'),`
		`+ ('1.3.9', ('1.3.10', '1.4.2.0')),`
		`+ ('1.4.0.1', ('1.3.9', '1.4.1.0', '1.4.2.1')),`
		`+ ('1.4.1', '1.4.2.0-20191115gitbadc0ffee' ),`
		`+ ])`
		`+ def test_ds_is_older_versions(ds_ver, cmp_ver):`
		`+ if isinstance(cmp_ver, tuple):`
		`+ assert ds_is_related('older', ds_ver, *cmp_ver)`
		`+ else:`
		`+ assert ds_is_related('older', ds_ver, cmp_ver)`
		`+`
		`+ @pytest.mark.parametrize('ds_ver, cmp_ver', [`
		`+ ('1.3.2', '1.3.1'),`
		`+ ('1.3.10', '1.3.1'),`
		`+ ('1.3.10', '1.3.2'),`
		`+ ('1.3.10', ('1.3.9', '1.4.2.0')),`
		`+ ('1.4.2.1', ('1.3.9', '1.4.0.1', '1.4.2.0')),`
		`+ ('1.4.2.0-20191115gitbadc0ffee', '1.4.1' ),`
		`+ ])`
		`+ def test_ds_is_newer_versions(ds_ver, cmp_ver):`
		`+ if isinstance(cmp_ver, tuple):`
		`+ assert ds_is_related('newer', ds_ver, *cmp_ver)`
		`+ else:`
		`+ assert ds_is_related('newer', ds_ver, cmp_ver)`
		`+`
		`+`
		`if __name__ == "__main__":`
		`CURRENT_FILE = os.path.realpath(__file__)`
		`pytest.main("-s -v %s" % CURRENT_FILE)`

src/lib389/lib389/utils.py

file modified

+6 -5

		`@@ -40,7 +40,7 @@`
		`import operator`
		`import subprocess`
		`import math`
		`- from packaging.version import LegacyVersion`
		`+ from pkg_resources.extern.packaging.version import LegacyVersion`
		`from socket import getfqdn`
		`from ldapurl import LDAPUrl`
		`from contextlib import closing`
		`@@ -1067,13 +1067,12 @@`
		`return p.version`


		`- def ds_is_related(relation, *ver):`
		`+ def ds_is_related(relation, ds_ver, *ver):`
		`"""`
		`Return a result of a comparison between the current version of ns-slapd and a provided version.`
		`"""`
		`ops = {'older': operator.lt,`
		`'newer': operator.ge}`
		`- ds_ver = get_ds_version()`
		`if len(ver) > 1:`
		`for cmp_ver in ver:`
		`if cmp_ver.startswith(ds_ver[:3]):`
		`@@ -1086,14 +1085,16 @@`
		`"""`
		`Return True if the current version of ns-slapd is older than a provided version`
		`"""`
		`- return ds_is_related('older', *ver)`
		`+ ds_ver = get_ds_version()`
		`+ return ds_is_related('older', ds_ver, *ver)`


		`def ds_is_newer(*ver):`
		`"""`
		`Return True if the current version of ns-slapd is newer than a provided version`
		`"""`
		`- return ds_is_related('newer', *ver)`
		`+ ds_ver = get_ds_version()`
		`+ return ds_is_related('newer', ds_ver, *ver)`


		`def gentime_to_datetime(gentime):`

src/lib389/requirements.txt

file modified

+1 -1

		`@@ -6,4 +6,4 @@`
		`argcomplete`
		`argparse-manpage`
		`python-ldap`
		`- packaging`
		`+ setuptools`

src/lib389/setup.py

file modified

+1 -1

		`@@ -82,7 +82,7 @@`
		`'argcomplete',`
		`'argparse-manpage',`
		`'python-ldap',`
		`- 'packaging',`
		`+ 'setuptools',`
		`],`

		`cmdclass={`

vashirov commented 4 years ago

Bug Description:
python3-packaging is not shipped in RHEL8. But it's bundled with
setuptools which is present in all major distributions.

Fix Description:
Use pkg_resources module from setuptools which provides needed
functionality, change lib389 and rpm dependencies accordingly.

Unfortunately, pkg_resources.parse_version() returns different
objects for different strings too, so use LegacyVersion directly
from pkg_resources.extern.packaging.version.

Fixes: https://pagure.io/389-ds-base/issue/50712
Relates: https://pagure.io/389-ds-base/issue/50706