Fix regexes to split only prefixes/suffixes

In theory this shouldn't be necessary, but it's better to be safe. Signed-off-by: Nikola Forró <[email protected]>
packit · Jul 2, 2024 · cac33a0 · cac33a0
1 parent ea9a85b
commit cac33a0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/specfile/prep.py b/specfile/prep.py
@@ -112,7 +112,7 @@ class PatchMacro(PrepMacro):
     @property
     def number(self) -> int:
         """Number of the %patch macro."""
-        tokens = re.split(r"(\d+)", self.name, maxsplit=1)
+        tokens = re.split(r"(\d+)$", self.name, maxsplit=1)
         if len(tokens) > 1:
             return int(tokens[1])
         if self.options.P is not None:
@@ -123,7 +123,7 @@ def number(self) -> int:
 
     @number.setter
     def number(self, value: int) -> None:
-        tokens = re.split(r"(\d+)", self.name, maxsplit=1)
+        tokens = re.split(r"(\d+)$", self.name, maxsplit=1)
         if len(tokens) > 1:
             self.name = f"{tokens[0]}{value}"
         elif self.options.P is not None:

diff --git a/specfile/sources.py b/specfile/sources.py
@@ -104,7 +104,7 @@ def _extract_number(self) -> Optional[str]:
         Returns:
             Extracted number or `None` if there isn't one.
         """
-        tokens = re.split(r"(\d+)", self._tag.name, maxsplit=1)
+        tokens = re.split(r"(\d+)$", self._tag.name, maxsplit=1)
         if len(tokens) > 1:
             return tokens[1]
         return None

diff --git a/specfile/value_parser.py b/specfile/value_parser.py
@@ -74,7 +74,7 @@ class MacroSubstitution(Node):
     """Node representing macro substitution, e.g. _%version_."""
 
     def __init__(self, body: str) -> None:
-        tokens = re.split(r"([?!]*)", body, maxsplit=1)
+        tokens = re.split(r"^([?!]*)", body, maxsplit=1)
         if len(tokens) == 1:
             self.prefix, self.name = "", tokens[0]
         else:
@@ -97,7 +97,7 @@ class EnclosedMacroSubstitution(Node):
     """Node representing macro substitution enclosed in brackets, e.g. _%{?dist}_."""
 
     def __init__(self, body: str) -> None:
-        tokens = re.split(r"([?!]*)", body, maxsplit=1)
+        tokens = re.split(r"^([?!]*)", body, maxsplit=1)
         if len(tokens) == 1:
             self.prefix, rest = "", tokens[0]
         else:
@@ -129,7 +129,7 @@ class ConditionalMacroExpansion(Node):
     """Node representing conditional macro expansion, e.g. _%{?prerel:0.}_."""
 
     def __init__(self, condition: str, body: List[Node]) -> None:
-        tokens = re.split(r"([?!]*)", condition, maxsplit=1)
+        tokens = re.split(r"^([?!]*)", condition, maxsplit=1)
         if len(tokens) == 1:
             self.prefix, self.name = "", tokens[0]
         else:
@@ -271,7 +271,7 @@ def find_macro_end(index):
             elif value[start + 1] == "{":
                 if ":" in value[start:end]:
                     condition, body = value[start + 2 : end - 1].split(":", maxsplit=1)
-                    tokens = re.split(r"([?!]*)", condition, maxsplit=1)
+                    tokens = re.split(r"^([?!]*)", condition, maxsplit=1)
                     prefix = tokens[0 if len(tokens) == 1 else 1]
                     if "?" in prefix:
                         result.append(