diff options
Diffstat (limited to 'Bugzilla/BugUrl/Launchpad.pm')
-rw-r--r-- | Bugzilla/BugUrl/Launchpad.pm | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/Bugzilla/BugUrl/Launchpad.pm b/Bugzilla/BugUrl/Launchpad.pm index a56fed4ad..4b3bb3b0d 100644 --- a/Bugzilla/BugUrl/Launchpad.pm +++ b/Bugzilla/BugUrl/Launchpad.pm @@ -19,30 +19,32 @@ use Bugzilla::Error; ############################### sub should_handle { - my ($class, $uri) = @_; - return ($uri->authority =~ /launchpad.net$/) ? 1 : 0; + my ($class, $uri) = @_; + return ($uri->authority =~ /launchpad.net$/) ? 1 : 0; } sub _check_value { - my ($class, $uri) = @_; - - $uri = $class->SUPER::_check_value($uri); - - my $value = $uri->as_string; - # Launchpad bug URLs can look like various things: - # https://bugs.launchpad.net/ubuntu/+bug/1234 - # https://launchpad.net/bugs/1234 - # All variations end with either "/bugs/1234" or "/+bug/1234" - if ($uri->path =~ m|bugs?/(\d+)$|) { - # This is the shortest standard URL form for Launchpad bugs, - # and so we reduce all URLs to this. - $value = "https://launchpad.net/bugs/$1"; - } - else { - ThrowUserError('bug_url_invalid', { url => $value, reason => 'id' }); - } - - return new URI($value); + my ($class, $uri) = @_; + + $uri = $class->SUPER::_check_value($uri); + + my $value = $uri->as_string; + + # Launchpad bug URLs can look like various things: + # https://bugs.launchpad.net/ubuntu/+bug/1234 + # https://launchpad.net/bugs/1234 + # All variations end with either "/bugs/1234" or "/+bug/1234" + if ($uri->path =~ m|bugs?/(\d+)$|) { + + # This is the shortest standard URL form for Launchpad bugs, + # and so we reduce all URLs to this. + $value = "https://launchpad.net/bugs/$1"; + } + else { + ThrowUserError('bug_url_invalid', {url => $value, reason => 'id'}); + } + + return new URI($value); } 1; |