diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2012-08-31 12:31:04 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2012-08-31 12:31:04 +0200 |
| commit | 3088b1d2724d7959ea87e84cab98963e2d2c3e72 (patch) | |
| tree | 1e2d34957160e9375539f8e03a025e984455f7ab /Bugzilla/Install | |
| parent | ab612efff307c445c25d010ac8a2eaba6fd93228 (diff) | |
| download | bugzilla-3088b1d2724d7959ea87e84cab98963e2d2c3e72.tar.gz bugzilla-3088b1d2724d7959ea87e84cab98963e2d2c3e72.tar.xz | |
Bug 655477: Bugzilla now requires Perl 5.10.1
r=mkanat a=LpSolit
Diffstat (limited to 'Bugzilla/Install')
| -rw-r--r-- | Bugzilla/Install/CPAN.pm | 13 | ||||
| -rw-r--r-- | Bugzilla/Install/Requirements.pm | 12 |
2 files changed, 2 insertions, 23 deletions
diff --git a/Bugzilla/Install/CPAN.pm b/Bugzilla/Install/CPAN.pm index 92ab5a267..10e0cce66 100644 --- a/Bugzilla/Install/CPAN.pm +++ b/Bugzilla/Install/CPAN.pm @@ -167,20 +167,9 @@ sub install_module { if (!$module) { die install_string('no_such_module', { module => $name }) . "\n"; } - my $version = $module->cpan_version; - my $module_name = $name; - - if ($name eq 'LWP::UserAgent' && $^V lt v5.8.8) { - # LWP 6.x requires Perl 5.8.8 or newer. - # As PAUSE only indexes the very last version of each module, - # we have to specify the path to the tarball ourselves. - $name = 'GAAS/libwww-perl-5.837.tar.gz'; - # This tarball contains LWP::UserAgent 5.835. - $version = '5.835'; - } print install_string('install_module', - { module => $module_name, version => $version }) . "\n"; + { module => $name, version => $module->cpan_version }) . "\n"; if ($test) { CPAN::Shell->force('install', $name); diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index c5abf1986..24aa1cb82 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -562,21 +562,11 @@ sub print_module_instructions { # We only print the PPM repository note if we have to. my $perl_ver = sprintf('%vd', $^V); if ($need_module_instructions && ON_ACTIVESTATE && vers_cmp($perl_ver, '5.12') < 0) { - # URL when running Perl 5.8.x. - my $url_to_theory58S = 'http://theoryx5.uwinnipeg.ca/ppms'; - # Packages for Perl 5.10 are not compatible with Perl 5.8. - if (vers_cmp($perl_ver, '5.10') > -1) { - $url_to_theory58S = 'http://cpan.uwinnipeg.ca/PPMPackages/10xx/'; - } + my $url_to_theory58S = 'http://cpan.uwinnipeg.ca/PPMPackages/10xx/'; print colored( install_string('ppm_repo_add', { theory_url => $url_to_theory58S }), COLOR_ERROR); - - # ActivePerls older than revision 819 require an additional command. - if (ON_ACTIVESTATE < 819) { - print install_string('ppm_repo_up'); - } } if ($need_module_instructions or @{ $check_results->{apache} }) { |