Use dnf-3 on the CI to workaround https://bugzilla.redhat.com/2223347
This commit is contained in:
@@ -50,14 +50,14 @@ for python in sorted(tested_pythons):
|
||||
|
||||
# Get all packages that supplement tox,
|
||||
# no repo explicitly specified means we use the enabled repos on the CI system which should be what we want
|
||||
repoquery_result = subprocess.check_output(['dnf', 'repoquery', '--whatsupplements', 'tox'], text=True)
|
||||
repoquery_result = subprocess.check_output(['dnf-3', 'repoquery', '--whatsupplements', 'tox'], text=True)
|
||||
supplementing_pkgs = set(repoquery_result.splitlines())
|
||||
|
||||
|
||||
# It gets quite tricky, since packages like "pypy" can supplement tox, we get a set of provides for all of them
|
||||
supplementing_pkgs_provides = {}
|
||||
for nvra in supplementing_pkgs:
|
||||
repoquery_result = subprocess.check_output(['dnf', '-q', 'repoquery', '--provides', nvra], text=True)
|
||||
repoquery_result = subprocess.check_output(['dnf-3', '-q', 'repoquery', '--provides', nvra], text=True)
|
||||
provides = set(repoquery_result.splitlines())
|
||||
unversioned_provides = {provide.split(' ')[0] for provide in provides}
|
||||
supplementing_pkgs_provides[nvra.rsplit('-', 2)[0]] = unversioned_provides
|
||||
|
||||
+1
-1
@@ -89,7 +89,7 @@
|
||||
- python2-devel
|
||||
- pypy3.9-devel
|
||||
- python3-tox
|
||||
- dnf
|
||||
- python3-dnf
|
||||
- mock
|
||||
- rpmdevtools
|
||||
- rpm-build
|
||||
|
||||
Reference in New Issue
Block a user