diff options
| author | Vitaly Belekhov <rmrf17@gmail.com> | 2018-01-04 22:50:05 +0700 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-01-04 10:50:05 -0500 |
| commit | 842ac4647276ba5354289082adbdca75e0b19107 (patch) | |
| tree | 1420238c5f275416b7aa0b4023c6dd6fdd618948 /Bugzilla/Install | |
| parent | 726dbd97cdf46a766ba8da6959594833ee03d65a (diff) | |
| download | bugs-842ac4647276ba5354289082adbdca75e0b19107.tar bugs-842ac4647276ba5354289082adbdca75e0b19107.tar.gz bugs-842ac4647276ba5354289082adbdca75e0b19107.tar.bz2 bugs-842ac4647276ba5354289082adbdca75e0b19107.tar.xz bugs-842ac4647276ba5354289082adbdca75e0b19107.zip | |
Bug 1301887 - File::Slurp triggers warnings on perl 5.24 (#53)
* Bug 1301887 - File::Slurp triggers warnings on perl 5.24 and it is recommended to not use it (#21)
r=mtyson
* Fix for vrite in aa735d4
* Added https://gitweb.gentoo.org/proj/gentoo-bugzilla.git/commit/?id=ca7bfc9c485c959fad2aee1f7c1dbc0fb484553b
Diffstat (limited to 'Bugzilla/Install')
| -rw-r--r-- | Bugzilla/Install/Filesystem.pm | 3 | ||||
| -rw-r--r-- | Bugzilla/Install/Requirements.pm | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 43512e79c..d30ae18dc 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -31,7 +31,6 @@ use File::Path; use File::Basename; use File::Copy qw(move); use File::Spec; -use File::Slurp; use IO::File; use POSIX (); @@ -536,7 +535,7 @@ sub update_filesystem { # Remove old assets htaccess file to force recreation with correct values. if (-e "$assetsdir/.htaccess") { - if (read_file("$assetsdir/.htaccess") =~ /<FilesMatch \\\.css\$>/) { + if (read_text("$assetsdir/.htaccess") =~ /<FilesMatch \\\.css\$>/) { unlink("$assetsdir/.htaccess"); } } diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index a688a0ffa..61496d843 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -156,11 +156,6 @@ sub REQUIRED_MODULES { version => '1.0.1', }, { - package => 'File-Slurp', - module => 'File::Slurp', - version => '9999.13', - }, - { package => 'JSON-XS', module => 'JSON::XS', # 2.0 is the first version that will work with JSON::RPC. |