diff options
| author | Frédéric Buclin <LpSolit@netscape.net> | 2018-02-18 18:25:30 +0100 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@netscape.net> | 2018-02-18 18:25:30 +0100 |
| commit | c52e3c6e8ad547ec035309994144fd22e2925267 (patch) | |
| tree | d762218e6f71e302121d6112ad14deb5552201f8 /Bugzilla/Install | |
| parent | d966c278e6c653a90343c739ac5a48f4127cf7e0 (diff) | |
| parent | 37784703eba80cb61d1734a11e09b62fa0eaeae9 (diff) | |
| download | bugs-c52e3c6e8ad547ec035309994144fd22e2925267.tar bugs-c52e3c6e8ad547ec035309994144fd22e2925267.tar.gz bugs-c52e3c6e8ad547ec035309994144fd22e2925267.tar.bz2 bugs-c52e3c6e8ad547ec035309994144fd22e2925267.tar.xz bugs-c52e3c6e8ad547ec035309994144fd22e2925267.zip | |
Sync with upstream release 5.0.4
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. |