aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2012-01-19 23:50:09 (GMT)
committerRobin H. Johnson <robbat2@gentoo.org>2012-01-19 23:50:09 (GMT)
commit09894873b358904e4639eaf11f84cf6011de5030 (patch)
tree5bbecfd22550295f0430783bf8f5484de790f27f
parentFix bugzilla statuses (diff)
downloadpackages-09894873b358904e4639eaf11f84cf6011de5030.zip
packages-09894873b358904e4639eaf11f84cf6011de5030.tar.gz
packages-09894873b358904e4639eaf11f84cf6011de5030.tar.bz2
Handle URLs wrapped with quotes in changelog messages. The quotes are not part of the URL.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rw-r--r--web/lib/changelog_formatter.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/web/lib/changelog_formatter.py b/web/lib/changelog_formatter.py
index 76a6661..35dc5d7 100644
--- a/web/lib/changelog_formatter.py
+++ b/web/lib/changelog_formatter.py
@@ -47,8 +47,8 @@ re_email2 = re.compile(r'([^@ ]+)@gentoo.org')
re_file = re.compile(r'([\+-]?)(\S+)([:,]|[:,]$)')
re_bugid = re.compile(r'([Bb][uU][gG]\s+?#?)(\d+)')
re_url_base = '(https?://[^\s/)>]+(?:/[\S]+)?)'
-re_url = re.compile("([\s<(]*)"+re_url_base+"([\s>)]+?.?|$)?")
-re_url_notend = re.compile(r'[\s.)>]+$')
+re_url = re.compile("([\s<(]*)"+re_url_base+"([\s>)\"']+?.?|$)?")
+re_url_notend = re.compile(r'[\s.)>\'"]+$')
def _pretty_changelog_pass1(cat, pn, changelog):
"""Changelog prettification, pass1: replace text with markers"""