From 7e33935760b6bfcb13f14613bbaa079eaeace97d Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 20 Nov 2020 15:53:28 -0500 Subject: [PATCH] MBSResolver: remove non-functional handling of RPM filtering Code in MBSResolver.resolve_requires() to compute filtered_rpms() assumed the response from MBS has a "rpms" key with binary RPMS from the build, but this was never implemented. --- module_build_service/resolver/MBSResolver.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/module_build_service/resolver/MBSResolver.py b/module_build_service/resolver/MBSResolver.py index fe28217b..9dbc9959 100644 --- a/module_build_service/resolver/MBSResolver.py +++ b/module_build_service/resolver/MBSResolver.py @@ -5,8 +5,6 @@ from __future__ import absolute_import import logging -import kobo.rpmlib - from module_build_service.common import models from module_build_service.common.config import conf from module_build_service.common.errors import StreamNotXyz, UnprocessableEntity @@ -448,7 +446,6 @@ class MBSResolver(KojiResolver): commit_hash = None version = None - filtered_rpms = [] module = self.get_module( module_name, module_stream, module_version, module_context, strict=True ) @@ -457,20 +454,6 @@ class MBSResolver(KojiResolver): if mmd.get_xmd().get("mbs", {}).get("commit"): commit_hash = mmd.get_xmd()["mbs"]["commit"] - # Find out the particular NVR of filtered packages - if "rpms" in module and mmd.get_rpm_filters(): - for rpm in module["rpms"]: - nvr = kobo.rpmlib.parse_nvra(rpm) - # If the package is not filtered, continue - if not nvr["name"] in mmd.get_rpm_filters(): - continue - - # If the nvr is already in filtered_rpms, continue - nvr = kobo.rpmlib.make_nvr(nvr, force_epoch=True) - if nvr in filtered_rpms: - continue - filtered_rpms.append(nvr) - if module.get("version"): version = module["version"] @@ -481,7 +464,6 @@ class MBSResolver(KojiResolver): "version": str(version), "context": module["context"], "koji_tag": module["koji_tag"], - "filtered_rpms": filtered_rpms, } else: raise RuntimeError(