Fix EVR regex to not match email addresses with - in them

packit · Jan 6, 2025 · 55039df · 55039df
1 parent c0a98a8
commit 55039df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/specfile/changelog.py b/specfile/changelog.py
@@ -88,12 +88,12 @@ def evr(self) -> Optional[str]:
         m = re.match(
             r"""
             ^.*
-            \s+                       # preceding whitespace
-            ((?P<sb>\[)|(?P<rb>\())?  # optional opening bracket
-            (?P<evr>(\d+:)?\S+-\S+?)  # EVR
-            (?(sb)\]|(?(rb)\)))       # matching closing bracket
-            :?                        # optional colon
-            \s*                       # optional following whitespace
+            \s+                             # preceding whitespace
+            ((?P<sb>\[)|(?P<rb>\())?        # optional opening bracket
+            (?P<evr>(\d+:)?(\d+\.)\S*-\S+?) # EVR
+            (?(sb)\]|(?(rb)\)))             # matching closing bracket
+            :?                              # optional colon
+            \s*                             # optional following whitespace
             $
             """,
             self.header,

diff --git a/tests/unit/test_changelog.py b/tests/unit/test_changelog.py
@@ -14,6 +14,7 @@
     "header, evr",
     [
         ("* Thu Jan 04 2007 Michael Schwendt <[email protected]>", None),
+        ("* Thu Jan 04 2007 Michael Schwendt <[email protected]>", None),
         (
             "* Mon Jul 13 2020 Tom Stellard <[email protected]> 4.0-0.4.pre2",
             "4.0-0.4.pre2",