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

dcermak · dcermak · commit 55039df973d5 · 2025-01-06T17:15:00.000+01:00
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 <mschwendt@fedoraproject.org>", None),
+        ("* Thu Jan 04 2007 Michael Schwendt <mschwendt@fedora-project.org>", None),
         (
             "* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> 4.0-0.4.pre2",
             "4.0-0.4.pre2",

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`"header, evr",`
`15`	`15`	`[`
`16`	`16`	`("* Thu Jan 04 2007 Michael Schwendt <mschwendt@fedoraproject.org>", None),`
	`17`	`+ ("* Thu Jan 04 2007 Michael Schwendt <mschwendt@fedora-project.org>", None),`
`17`	`18`	`(`
`18`	`19`	`"* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> 4.0-0.4.pre2",`
`19`	`20`	`"4.0-0.4.pre2",`