diff options
author | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-04-21 00:00:57 +0200 |
---|---|---|
committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-04-21 00:00:57 +0200 |
commit | 00d71f7cd9251f39015ce724af0794c6931f0db7 (patch) | |
tree | a8796d30acb65bc71063593cccaa815b6eaee135 /Bugzilla/Install/Requirements.pm | |
parent | b2b1427ab7605f483f7b32381701bdf14cc174f9 (diff) | |
download | bugzilla-00d71f7cd9251f39015ce724af0794c6931f0db7.tar.gz bugzilla-00d71f7cd9251f39015ce724af0794c6931f0db7.tar.xz |
Bug 560330: Make sure that we always have a modern version of CPAN
installed when running install-module.pl. Otherwise, certain modules
(like DateTime) weren't getting their XS compiled or their dependencies
installed with Perl 5.8.8 and earlier.
This also updates the urllist to remove perl.secsup.org (which was
hanging when used with curl) and add a few more mirrors (including
some in Europe).
r=mkanat, a=mkanat (module owner)
Diffstat (limited to 'Bugzilla/Install/Requirements.pm')
-rw-r--r-- | Bugzilla/Install/Requirements.pm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index b80d7fa8b..83c6c2c90 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -542,6 +542,10 @@ sub have_vers { if ($module eq 'CGI' && $vnum =~ /(2\.7\d)(\d+)/) { $vnum = $1 . "." . $2; } + # CPAN did a similar thing, where it has versions like 1.9304. + if ($module eq 'CPAN' and $vnum =~ /^(\d\.\d{2})\d{2}$/) { + $vnum = $1; + } my $vstr; if ($vnum eq "-1") { # string compare just in case it's non-numeric |