From 250370e96fec78b0ccb760d89f04193673b81d46 Mon Sep 17 00:00:00 2001 From: Manuel Naranjo Date: Tue, 21 Apr 2026 22:11:44 +0200 Subject: [PATCH] bug: delay non registered rpm failures Make sure we can render the extension and delay the fact that a given rpm is not known until that rpm is actually being requested from the dependency graph, allowing users for instance to generate a new lock file --- bazeldnf/extensions.bzl | 45 +++++++++++++++++++++++++++++++++-------- internal/rpm.bzl | 12 +++++++++++ 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/bazeldnf/extensions.bzl b/bazeldnf/extensions.bzl index d0b5e24b..a05ec757 100644 --- a/bazeldnf/extensions.bzl +++ b/bazeldnf/extensions.bzl @@ -6,7 +6,7 @@ based on: https://github.com/bazel-contrib/rules-template/blob/0dadcb716f06f6728 """ load("@bazel_features//:features.bzl", "bazel_features") -load("//internal:rpm.bzl", rpm_repository = "rpm") +load("//internal:rpm.bzl", invalid_rpm_repository = "invalid_rpm", rpm_repository = "rpm") load(":repositories.bzl", "bazeldnf_register_toolchains") _DEFAULT_NAME = "bazeldnf" @@ -269,13 +269,12 @@ def _handle_lock_file(config, module_ctx, registered_rpms = {}, registered_blobs # Create repositories for each top-level target with suffixed dependencies for target in config.rpms: - if target not in rpm_lookup: - fail("requested rpm %s is not known to the lock file %s" % (target, config.lock_file)) - - # Build transitive dependency closure for this target - target_deps = _build_transitive_deps(rpm_lookup, target) - repo_info = _add_rpm_repository(config, rpm_lookup[target], registered_rpms, dependencies = target_deps) - + if target in rpm_lookup: + # Build transitive dependency closure for this target + target_deps = _build_transitive_deps(rpm_lookup, target) + repo_info = _add_rpm_repository(config, rpm_lookup[target], registered_rpms, dependencies = target_deps) + else: + repo_info = _add_missing_rpm_repository(config, target, registered_rpms) packages_metadata.setdefault(repo_info.get("package", repo_info["id"]), []).append(repo_info) if not config.rpms: @@ -397,6 +396,36 @@ def _add_rpm_repository(config, rpm, registered_rpms, dependencies = []): return metadata +def _add_missing_rpm_repository(config, rpm, registered_rpms): + repo_prefix = config.rpm_repository_prefix + if repo_prefix: + repo_prefix = "{}-".format(repo_prefix) + + name, id, package = _normalize_repository_name({"name": rpm}, repo_prefix, config.lock_file) + + # the same rpm may be in the transitive closure of an already explored rpm, but it may be + # a requested target, in which case we need to override the previously defined case + if name in registered_rpms: + return registered_rpms[name] + + invalid_rpm_repository( + name = name, + original_name = rpm, + lock_file = config.lock_file, + ) + + metadata = { + "repo_name": name, + "id": id, + } + + if package: + metadata["package"] = package + + registered_rpms[name] = metadata + + return metadata + def _bazeldnf_extension(module_ctx): # make sure all our dependencies are registered as those may be needed when those # depending in this repo build the toolchain from sources diff --git a/internal/rpm.bzl b/internal/rpm.bzl index d22fca10..485cbd47 100644 --- a/internal/rpm.bzl +++ b/internal/rpm.bzl @@ -168,6 +168,18 @@ rpm = repository_rule( attrs = _rpm_attrs, ) +def _invalid_rpm_impl(ctx): + fail("requested rpm %s is not known to the lock file %s" % (ctx.attr.original_name, ctx.attr.lock_file)) + +invalid_rpm = repository_rule( + implementation = _invalid_rpm_impl, + attrs = dict( + _rpm_attrs, + lock_file = attr.label(), + original_name = attr.string(), + ), +) + def _null_rpm_rule_impl(_): return [ RpmInfo(