From 18bf8d3bbe4988e8826b862a6300cc7c4497e8dc Mon Sep 17 00:00:00 2001 From: Ben Kircher Date: Sat, 17 Feb 2024 15:10:29 +0100 Subject: [PATCH] Fix endless loop Fix possible endless loop when parsing - build_requires - requires - conflicts - obsoletes - provides tags that contain macros. Fixes #66. --- pyrpm/spec.py | 2 -- scripts/fedora_sources.py | 11 ++--------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pyrpm/spec.py b/pyrpm/spec.py index bbf4c48..a1369d4 100644 --- a/pyrpm/spec.py +++ b/pyrpm/spec.py @@ -163,8 +163,6 @@ def update_impl(self, spec_obj: "Spec", context: Dict[str, Any], match_obj: re.M ]: # Remove comments on same line value = value.split("#", 2)[0].rstrip() - # Macros are valid in requirements - value = replace_macros(value, spec=spec_obj) # It's also legal to do: # Requires: a b c diff --git a/scripts/fedora_sources.py b/scripts/fedora_sources.py index 24ef08e..3175a50 100644 --- a/scripts/fedora_sources.py +++ b/scripts/fedora_sources.py @@ -4,15 +4,8 @@ from pyrpm.spec import Spec -# Spec files to skip because of known issues. All of the following end up in an -# endless loop -skipfiles = ( - "cairo-dock.spec", - "ghc", - "libreoffice.spec", - "python-pyghmi.spec", - "xscreensaver.spec", -) +# Spec files to skip because of known issues. +skipfiles = () def skip(filename: str) -> bool: