diff options
| -rw-r--r-- | Bugzilla/BugUrl/Debian.pm | 7 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Bugzilla/BugUrl/Debian.pm b/Bugzilla/BugUrl/Debian.pm index 2b611aa57..b726b0b5a 100644 --- a/Bugzilla/BugUrl/Debian.pm +++ b/Bugzilla/BugUrl/Debian.pm @@ -23,7 +23,10 @@ sub should_handle { # Debian BTS URLs can look like various things: # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1234 # http://bugs.debian.org/1234 - return (lc($uri->authority) eq 'bugs.debian.org' + # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=123 + # https://debbugs.gnu.org/123 + return ((lc($uri->authority) eq 'bugs.debian.org' + or lc($uri->authority) eq 'debbugs.gnu.org') and (($uri->path =~ /bugreport\.cgi$/ and $uri->query_param('bug') =~ m|^\d+$|) or $uri->path =~ m|^/\d+$|)) ? 1 : 0; @@ -37,7 +40,7 @@ sub _check_value { # This is the shortest standard URL form for Debian BTS URLs, # and so we reduce all URLs to this. $uri->path =~ m|^/(\d+)$| || $uri->query_param('bug') =~ m|^(\d+)$|; - $uri = new URI("http://bugs.debian.org/$1"); + $uri = new URI('https://' . $uri->authority . '/' . $1); return $uri; } diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index dde12415f..eb6641f0b 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -285,7 +285,7 @@ installation.</li> <li>A b[% %]ug on launchpad.net.</li> <li>An issue on code.google.com.</li> - <li>A b[% %]ug on b[% %]ugs.debian.org.</li> + <li>A b[% %]ug on b[% %]ugs.debian.org or deb[% %]ugs.gnu.org.</li> <li>An issue in a JIRA installation.</li> <li>A ticket in a Trac installation.</li> <li>A b[% %]ug in a MantisBT installation.</li> |