Merge lp:~osomon/ubuntu/focal/apport/upgrade-urls-re into lp:~ubuntu-core-dev/ubuntu/focal/apport/ubuntu

[Olivier Tilloy]

This is a quick fix for bug #1871185.

Matching all valid URLs with a regular expression is a complex problem, so I'm pretty sure this doesn't cover all cases, but at least it covers the case for "ubuntu-bug chromium" (scratching my own itch).

I wonder though, shouldn't that code be refactored to build a hyperlink from the URL before inserting it into the text (when setting the value of report['UnreportableReason'] in collect_info())? In that way there wouldn't be a need for using regular expressions to guess where a URL might be.

[Brian Murray (brian-murray)]

I merged this but somehow Launchpad didn't catch it.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2020-04-16 00:21:14 +0000
+++ debian/changelog	2020-04-23 12:27:25 +0000
@@ -1,3 +1,10 @@
+apport (2.20.11-0ubuntu28) UNRELEASED; urgency=medium
+
+  * gtk/apport-gtk: upgrade regular expression used to match URLs in free text
+    (LP: #1871185)
+
+ -- Olivier Tilloy <[e-mail]>  Thu, 23 Apr 2020 14:14:52 +0200
+
 apport (2.20.11-0ubuntu27) focal; urgency=medium
 
   * backends/packaging-apt-dpkg.py, apport/sandboxutils.py: Add modifications

=== modified file 'gtk/apport-gtk'
--- gtk/apport-gtk	2019-05-16 19:37:48 +0000
+++ gtk/apport-gtk	2020-04-23 12:27:25 +0000
@@ -386,7 +386,7 @@
             if not isinstance(text, bytes):
                 text = text.encode('UTF-8')
             text = GLib.markup_escape_text(text)
-            text = re.sub(r'(https?://[a-zA-Z0-9._-]+(?:[a-zA-Z0-9_#?%/-])*)',
+            text = re.sub(r'(https?://[a-zA-Z0-9._-]+(?:[a-zA-Z0-9_#?%+=./-])*)',
                           r'<a href="\1">\1</a>', text)
             # turn URLs into links
             self.md.set_markup(text)