diff options
author | Byron Jones <bjones@mozilla.com> | 2013-04-04 06:55:18 +0200 |
---|---|---|
committer | Byron Jones <bjones@mozilla.com> | 2013-04-04 06:55:18 +0200 |
commit | a99582f977670f776f3eaf587db0107407738722 (patch) | |
tree | 76e10c0877e43f80a24e8721ddcbddbdd26b421b /Bugzilla/Install | |
parent | c62be4691146572b582dab517d44e4e40bc8abfc (diff) | |
parent | 28d7936f7c35e7bd795a44283332840a0e32a1aa (diff) | |
download | bugzilla-a99582f977670f776f3eaf587db0107407738722.tar.gz bugzilla-a99582f977670f776f3eaf587db0107407738722.tar.xz |
merge with bugzilla/4.2
Diffstat (limited to 'Bugzilla/Install')
-rw-r--r-- | Bugzilla/Install/Requirements.pm | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index 39cacedb0..83723b327 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -554,26 +554,6 @@ sub print_module_instructions { ( (!$output and @{$check_results->{missing}}) or ($output and $check_results->{any_missing}) ) ? 1 : 0; - # 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/'; - } - 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} }) { # If any output was required, we want to close the "table" print "*" x TABLE_WIDTH . "\n"; |