Skip to content

bugzilla
bugzilla
Commit f4c8d628 authored by Mike Frysinger's avatar Mike Frysinger Committed by Byron Jones
Browse files
Options

Bug 1167919: See Also: support debbugs.gnu.org tracker

r=glob,a=glob
parent bd2e246a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
Bugzilla/BugUrl/Debian.pm
View file @ f4c8d628
...@@ -23,7 +23,10 @@ sub should_handle { ...@@ -23,7 +23,10 @@ sub should_handle {
# Debian BTS URLs can look like various things: # Debian BTS URLs can look like various things:
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1234 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1234
# http://bugs.debian.org/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->path =~ /bugreport\.cgi$/
and $uri->query_param('bug') =~ m|^\d+$|) and $uri->query_param('bug') =~ m|^\d+$|)
or $uri->path =~ m|^/\d+$|)) ? 1 : 0; or $uri->path =~ m|^/\d+$|)) ? 1 : 0;
...@@ -37,7 +40,7 @@ sub _check_value { ...@@ -37,7 +40,7 @@ sub _check_value {
# This is the shortest standard URL form for Debian BTS URLs, # This is the shortest standard URL form for Debian BTS URLs,
# and so we reduce all URLs to this. # and so we reduce all URLs to this.
$uri->path =~ m|^/(\d+)$| || $uri->query_param('bug') =~ m|^(\d+)$|; $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; return $uri;
} }
......
template/en/default/global/user-error.html.tmpl
View file @ f4c8d628
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
installation.</li> installation.</li>
<li>A b[% %]ug on launchpad.net.</li> <li>A b[% %]ug on launchpad.net.</li>
<li>An issue on code.google.com.</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>An issue in a JIRA installation.</li>
<li>A ticket in a Trac installation.</li> <li>A ticket in a Trac installation.</li>
<li>A b[% %]ug in a MantisBT installation.</li> <li>A b[% %]ug in a MantisBT installation.</li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment