particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

depsolve: relax the module naming requirement

Browse source 
Remove the requirement for `:` in the name which would have been
selected by the fronted, instead asking dnf "is this a module?".

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
This commit is contained in:
Simon de Vlieger 2025-01-22 09:54:03 +01:00 • committed by Ondřej Budai
parent d92be415f8
commit ffcafb390d
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
osbuild/solver/dnf.py
View file

@ -348,10 +348,14 @@ class DNF(SolverBase):
modules = {} modules = {}
for transaction in transactions: for transaction in transactions:
# module specifications must start with an "@" and include a ":", filter them # module specifications must start with an "@", if they do we try to
# out so we can use them # ask DNF for a module by that name, if it doesn't exist it isn't a
modules_in_package_specs = [ # module; otherwise it is and we should use it
p[1:] for p in transaction.get("package-specs", []) if p.startswith("@") and ":" in p] modules_in_package_specs = []
for p in transaction.get("package-specs", []):
if p.startswith("@") and self.base_module.get_modules(p):
modules_in_package_specs.append(p.lstrip("@"))
if transaction.get("module-enable-specs") or modules_in_package_specs: if transaction.get("module-enable-specs") or modules_in_package_specs:
# we'll be checking later if any packages-from-modules are in the # we'll be checking later if any packages-from-modules are in the