Skip to content

Include "+" character in regex for package names #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jswu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Include "+" character in regex for package names #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions centos-errata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ class MessageParser(object):

#Common regular expressions
ARCH_SPLIT="(?P<arch>\w+):\s*$"
PACKAGE_LIST="(?P<checksum>\S+)\s+(?P<pkg_filename>[\.\w-]+.rpm)"
PACKAGE_LIST="(?P<checksum>\S+)\s+(?P<pkg_filename>[\.\w\+-]+.rpm)"

#Things to match in mailing list messages
ERRATA_SUBJECT="\[CentOS-announce\] (?P<errata_type>\w{4,4})-(?P<year>\d{4,4})(:|-)(?P<errata_id>\d{4,4})\s+(?P<other_info>.*)$"
Expand Down Expand Up @@ -947,7 +947,7 @@ class MessageMailArchive(MessageParser):
body_start_re = re.compile("<pre>")
body_end_re = re.compile("</pre>")
checksum_re = re.compile("(?P<checksum>\S{64,})")
rpm_file_re = re.compile("(?P<pkg_filename>[\.\w-]+.rpm)")
rpm_file_re = re.compile("(?P<pkg_filename>[\.\w\+-]+.rpm)")
clean_subject_re = re.compile("<[^>]*>")

def __init__(self,options):
Expand Down Expand Up @@ -1104,7 +1104,7 @@ def getName(self):

class SearchSpacewalk(SearchStrategy):

PACKAGE_NAMEONLY="(?P<pkg_name>.*?)-\d+.([\.\w-]+.rpm)"
PACKAGE_NAMEONLY="(?P<pkg_name>.*?)-\d+.([\.\w\+-]+.rpm)"

package_name_re=re.compile(PACKAGE_NAMEONLY)

Expand Down