Commit 1226f7f2 authored by lpsolit%gmail.com's avatar lpsolit%gmail.com

Bug 361149: Bugzilla now requires Perl 5.8.1 or newer (Perl 5.8.0 throws…

Bug 361149: Bugzilla now requires Perl 5.8.1 or newer (Perl 5.8.0 throws warnings about deprecated pseudo-hashes) - Patch by Fré©ric Buclin <LpSolit@gmail.com> r/a=mkanat
parent 1e872832
......@@ -264,8 +264,6 @@ sub write_params {
my $datadir = bz_locations()->{'datadir'};
my $param_file = "$datadir/params";
# This only has an affect for Data::Dumper >= 2.12 (ie perl >= 5.8.0)
# Its just cosmetic, though, so that doesn't matter
local $Data::Dumper::Sortkeys = 1;
my ($fh, $tmpname) = File::Temp::tempfile('params.XXXXX',
......
......@@ -106,8 +106,8 @@ sub html_light_quote {
require HTML::Parser;
};
# We need utf8_mode() from HTML::Parser 3.40 if running Perl >= 5.8.
if ($@ || ($] >= 5.008 && $HTML::Parser::VERSION < 3.40)) { # Package(s) not installed.
# We need utf8_mode() from HTML::Parser 3.40.
if ($@ || $HTML::Parser::VERSION < 3.40) { # Package(s) not installed.
my $safe = join('|', @allow);
my $chr = chr(1);
......@@ -171,10 +171,10 @@ sub html_light_quote {
comment => 0,
process => 0);
# Avoid filling the web server error log with Perl 5.8.x.
# Avoid filling the web server error log.
# In HTML::Scrubber 0.08, the HTML::Parser object is stored in
# the "_p" key, but this may change in future versions.
if ($] >= 5.008 && ref($scrubber->{_p}) eq 'HTML::Parser') {
if (ref($scrubber->{_p}) eq 'HTML::Parser') {
$scrubber->{_p}->utf8_mode(1);
}
return $scrubber->scrub($text);
......
......@@ -43,7 +43,7 @@
######################################################################
use strict;
use 5.008;
use 5.008001;
use File::Basename;
use Getopt::Long qw(:config bundling);
use Pod::Usage;
......@@ -56,8 +56,6 @@ use Bugzilla::Constants;
use Bugzilla::Install::Requirements;
use Bugzilla::Install::Util qw(install_string get_version_and_os);
require 5.008001 if ON_WINDOWS; # for CGI 2.93 or higher
######################################################################
# Live Code
######################################################################
......
......@@ -45,8 +45,7 @@
<!ENTITY bzg-bugs "<ulink url='https://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation'>Bugzilla Documentation</ulink>">
<!ENTITY mysql "http://www.mysql.com/">
<!ENTITY min-perl-ver "5.8.0">
<!ENTITY min-perl-ver-win "5.8.1">
<!ENTITY min-perl-ver "5.8.1">
]>
......
<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
<!-- $Id: installation.xml,v 1.141 2007/08/03 14:58:40 lpsolit%gmail.com Exp $ -->
<!-- $Id: installation.xml,v 1.142 2007/08/09 12:36:08 lpsolit%gmail.com Exp $ -->
<chapter id="installing-bugzilla">
<title>Installing Bugzilla</title>
......@@ -54,8 +54,7 @@
<procedure>
<step>
<para><link linkend="install-perl">Install Perl</link>
(&min-perl-ver; or above for non-Windows platforms; &min-perl-ver-win;
for Windows)
(&min-perl-ver; or above)
</para>
</step>
<step>
......
......@@ -36,11 +36,11 @@ use Test::More tests => scalar(@Support::Files::testitems);
use DBI;
my @DBI_drivers = DBI->available_drivers;
# Bugzilla requires Perl 5.8.0 now. Checksetup will tell you this if you run it, but
# Bugzilla requires Perl 5.8.1 now. Checksetup will tell you this if you run it, but
# it tests it in a polite/passive way that won't make it fail at compile time. We'll
# slip in a compile-time failure if it's missing here so a tinderbox on < 5.8 won't
# pass and mistakenly let people think Bugzilla works on any perl below 5.8.
require 5.008;
# slip in a compile-time failure if it's missing here so a tinderbox on < 5.8.1 won't
# pass and mistakenly let people think Bugzilla works on any perl below 5.8.1.
require 5.008001;
# Capture the TESTOUT from Test::More or Test::Builder for printing errors.
# This will handle verbosity for us automatically.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment