Skip to content

Commit c7a670a

Browse files
authored
Merge pull request #1007 from SUSE/req_mismatch
Accept mismatches when the buildrelease require component lengths is
2 parents cd51c51 + c32a1b3 commit c7a670a

1 file changed

Lines changed: 14 additions & 2 deletions

File tree

tests/test_all.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,21 @@ def test_no_downgrade_on_install(container: ContainerData) -> None:
337337
].partition("-")
338338
version, _, release = version.partition("-")
339339
if installed_version == version and release:
340-
assert packaging.version.parse(
340+
ver_installed_release = packaging.version.Version(
341341
installed_release
342-
) <= packaging.version.parse(release), (
342+
)
343+
ver_release = packaging.version.Version(release)
344+
if len(ver_installed_release.release) > len(
345+
ver_release.release
346+
):
347+
ver_installed_release = (
348+
ver_installed_release.__replace__(
349+
release=ver_installed_release.release[
350+
: len(ver_release.release)
351+
]
352+
)
353+
)
354+
assert ver_installed_release <= ver_release, (
343355
f"Installed {name} = {installed_release} is newer than "
344356
f"what {solvable['solvable:name']} requires (= {release})"
345357
)

0 commit comments

Comments
 (0)