From 0c2e29785af3de01e02d7bbe52bb3c7f5718004a Mon Sep 17 00:00:00 2001 From: Mustafa Gezen Date: Thu, 2 Feb 2023 15:11:28 +0100 Subject: [PATCH] Stop replacing module streams in synopsis/desc --- apollo/rhworker/poll_rh_activities.py | 5 +++-- apollo/rpmworker/rh_matcher_activities.py | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apollo/rhworker/poll_rh_activities.py b/apollo/rhworker/poll_rh_activities.py index 666aeff..f69d6a5 100644 --- a/apollo/rhworker/poll_rh_activities.py +++ b/apollo/rhworker/poll_rh_activities.py @@ -26,8 +26,9 @@ def parse_red_hat_date(rhdate: str) -> datetime.datetime: async def get_last_indexed_date() -> Optional[str]: state = await RedHatIndexState.get_or_none() return re.sub( - r"\+\d\d:\d\d", "", - state.last_indexed_at.isoformat("T") + "Z" + r"\+\d\d:\d\d", + "", + state.last_indexed_at.isoformat("T") + "Z", ) if state else None diff --git a/apollo/rpmworker/rh_matcher_activities.py b/apollo/rpmworker/rh_matcher_activities.py index 3cedc2d..c7ea4e6 100644 --- a/apollo/rpmworker/rh_matcher_activities.py +++ b/apollo/rpmworker/rh_matcher_activities.py @@ -1,4 +1,5 @@ import datetime +import re from dataclasses import dataclass from xml.etree import ElementTree as ET @@ -11,6 +12,8 @@ from apollo.rpmworker import repomd from common.logger import Logger +RHEL_CONTAINER_RE = re.compile(r"rhel(?:\d|)\/") + @dataclass class NewPackage: @@ -157,6 +160,7 @@ async def clone_advisory( "Red Hat Enterprise Linux", product.name ) synopsis = synopsis.replace("RHEL", product.name) + synopsis = RHEL_CONTAINER_RE.sub("", synopsis) synopsis = synopsis.replace("rhel", product.name) synopsis = synopsis.replace("Red Hat", product.vendor) synopsis = synopsis.replace(advisory.name, name) @@ -164,7 +168,7 @@ async def clone_advisory( "Red Hat Enterprise Linux", product.name ) description = description.replace("RHEL", product.name) - description = description.replace("rhel", product.name) + description = RHEL_CONTAINER_RE.sub("", description) description = description.replace("Red Hat", product.vendor) description = description.replace(advisory.name, name)