summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2024-05-19 20:27:37 +0200
committerHelmut Grohne <helmut@subdivi.de>2024-05-19 20:27:37 +0200
commitcd849b18123a79617c16e5503dffdc58aa149aa3 (patch)
treea7dfcae748972178dda038ca309f49b558afd586
parentda7f211d95977ea089f16f8dd14cff885b497710 (diff)
downloadcrossqa-cd849b18123a79617c16e5503dffdc58aa149aa3.tar.gz
depcheck: correctly handle alternative dependenciesHEADmaster
Dropping alternatives is not as simple as it seems. Alternatives are actually kept when the package name is equal. Hence foo (>> ...) | foo (<< ...) actually works and is able to select the latter alternative. We already strip alternatives via --deb-emulate-sbuild, so stripping in Python makes the dose input slightly smaller and slightly wrong. Skip doing so. mariadb now Build-Depends: libfmt-dev (>= 10.2.2) | libfmt-dev (<< 10) and the actual libfmt-dev is 9.x. Reported-by: Otto Kekäläinen <otto@debian.org>
-rwxr-xr-xdepcheck.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/depcheck.py b/depcheck.py
index 34ad497..3ac7daa 100755
--- a/depcheck.py
+++ b/depcheck.py
@@ -294,15 +294,6 @@ def strip_dict(dct, keepfields):
for k in keys:
del dct[k]
-def strip_alternatvies(dct, fields):
- for f in fields:
- try:
- value = dct[f]
- except KeyError:
- continue
- dct[f] = ",".join(dep.split("|", 1)[0]
- for dep in value.split(","))
-
def latest_versions(pkgs):
packages = {}
for p in pkgs:
@@ -350,7 +341,6 @@ def make_source_list(mirror, hostarch):
if any(arch_match(hostarch, pattern)
for pattern in p["Architecture"].split()):
strip_dict(p, srcfields)
- strip_alternatvies(p, srcdepfields)
yield p
else:
# dummy entry preventing older matching versions