[python-fmn-rules] Patch to fix regex matching.

Ralph Bean ralph at fedoraproject.org
Wed Jan 14 17:27:41 UTC 2015


commit 34292fffcf0605fe6c19cf0d5da52697ccdaa357
Author: Ralph Bean <rbean at redhat.com>
Date:   Wed Jan 14 12:27:57 2015 -0500

    Patch to fix regex matching.

 python-fmn-rules-fix-regex.patch |   36 ++++++++++++++++++++++++++++++++++++
 python-fmn-rules.spec            |   10 +++++++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/python-fmn-rules-fix-regex.patch b/python-fmn-rules-fix-regex.patch
new file mode 100644
index 0000000..5e092bb
--- /dev/null
+++ b/python-fmn-rules-fix-regex.patch
@@ -0,0 +1,36 @@
+From 1b9b2ee95401051b23eb28dae7b6bf9d4c57d961 Mon Sep 17 00:00:00 2001
+From: Ralph Bean <rbean at redhat.com>
+Date: Wed, 14 Jan 2015 12:25:44 -0500
+Subject: [PATCH] Fix regex.
+
+After debugging the last release in production, it seems like this needs to be
+``.search`` instead of ``.match``.
+---
+ fmn/rules/generic.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fmn/rules/generic.py b/fmn/rules/generic.py
+index c80255b..9a12a38 100644
+--- a/fmn/rules/generic.py
++++ b/fmn/rules/generic.py
+@@ -87,7 +87,7 @@ def package_regex_filter(config, message, pattern=None, *args, **kw):
+     if pattern:
+         packages = fedmsg.meta.msg2packages(message, **config)
+         regex = re.compile(pattern)
+-        return any([regex.match(package) for package in packages])
++        return any([regex.search(package) for package in packages])
+ 
+ 
+ def regex_filter(config, message, pattern=None, *args, **kw):
+@@ -104,7 +104,7 @@ def regex_filter(config, message, pattern=None, *args, **kw):
+     pattern = kw.get('pattern', pattern)
+     if pattern:
+         regex = re.compile(pattern)
+-        return bool(regex.match(fedmsg.encoding.dumps(message)))
++        return bool(regex.search(fedmsg.encoding.dumps(message)))
+ 
+ 
+ @hint(categories=['trac'], invertible=False)
+-- 
+2.1.0
+
diff --git a/python-fmn-rules.spec b/python-fmn-rules.spec
index 314cc7c..8750987 100644
--- a/python-fmn-rules.spec
+++ b/python-fmn-rules.spec
@@ -8,7 +8,7 @@
 
 Name:               python-fmn-rules
 Version:            0.4.3
-Release:            1%{?dist}
+Release:            2%{?dist}
 Summary:            Message processing rules for Fedora Notifications
 
 Group:              Development/Libraries
@@ -16,6 +16,9 @@ License:            LGPLv2+
 URL:                http://pypi.python.org/pypi/fmn.rules
 Source0:            http://pypi.python.org/packages/source/f/%{modname}/%{modname}-%{version}.tar.gz
 
+# https://github.com/fedora-infra/fmn.rules/pull/34
+Patch0:             python-fmn-rules-fix-regex.patch
+
 BuildArch:          noarch
 
 BuildRequires:      python2-devel
@@ -39,6 +42,8 @@ This module contains the set of "rules" fmn uses to process messages.
 %prep
 %setup -q -n %{modname}-%{version}
 
+%patch0 -p1
+
 # Remove bundled egg-info in case it exists
 rm -rf %{modname}.egg-info
 
@@ -57,6 +62,9 @@ rm -rf %{modname}.egg-info
 %{python2_sitelib}/%{modname}-%{version}*
 
 %changelog
+* Wed Jan 14 2015 Ralph Bean <rbean at redhat.com> - 0.4.3-2
+- Patch to fix regex matching.
+
 * Wed Jan 14 2015 Ralph Bean <rbean at redhat.com> - 0.4.3-1
 - Latest upstream.
 


More information about the scm-commits mailing list