mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-04-13 17:29:45 +08:00
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.
This commit is contained in:
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user