summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-09-02 06:56:23 +0200
committerByron Jones <glob@mozilla.com>2014-09-02 06:56:23 +0200
commit66aaf86644c2e2d649a2fc1a7074cef577eefa70 (patch)
treeea03d807c271241c02733ad26ac2197b635d57d7
parent2a9db67806fbc2483afce36e0660f03a99b5ec5f (diff)
downloadbugzilla-66aaf86644c2e2d649a2fc1a7074cef577eefa70.tar.gz
bugzilla-66aaf86644c2e2d649a2fc1a7074cef577eefa70.tar.xz
Bug 1056162: add bit.ly support to bmo
-rw-r--r--Bugzilla/Install/.Requirements.pm.swobin0 -> 16384 bytes
-rw-r--r--extensions/Bitly/Config.pm32
2 files changed, 25 insertions, 7 deletions
diff --git a/Bugzilla/Install/.Requirements.pm.swo b/Bugzilla/Install/.Requirements.pm.swo
new file mode 100644
index 000000000..ab3d6655c
--- /dev/null
+++ b/Bugzilla/Install/.Requirements.pm.swo
Binary files differ
diff --git a/extensions/Bitly/Config.pm b/extensions/Bitly/Config.pm
index 0c834eed2..aff9d4b4b 100644
--- a/extensions/Bitly/Config.pm
+++ b/extensions/Bitly/Config.pm
@@ -8,14 +8,32 @@
package Bugzilla::Extension::Bitly;
use strict;
+use Bugzilla::Install::Util qw(vers_cmp);
+
use constant NAME => 'Bitly';
-use constant REQUIRED_MODULES => [
- {
- package => 'LWP-Protocol-https',
- module => 'LWP::Protocol::https',
- version => 0
- },
-];
+
+sub REQUIRED_MODULES {
+ my @required;
+ push @required, {
+ package => 'LWP',
+ module => 'LWP',
+ version => 5,
+ };
+ # LWP 6 split https support into a separate package
+ if (Bugzilla::Install::Requirements::have_vers({
+ package => 'LWP',
+ module => 'LWP',
+ version => 6,
+ })) {
+ push @required, {
+ package => 'LWP-Protocol-https',
+ module => 'LWP::Protocol::https',
+ version => 0
+ };
+ }
+ return \@required;
+}
+
use constant OPTIONAL_MODULES => [
{
package => 'Mozilla-CA',