summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2009-08-19 07:51:21 +0200
committermkanat%bugzilla.org <>2009-08-19 07:51:21 +0200
commit1b04ef88ffb89c25db72bc0e8c5195468d2b00e1 (patch)
tree85a1183bce1d85899ac21b0e6f4756e09f602655
parentc9806c3558e6a37c748488520d0c83e471809104 (diff)
downloadbugzilla-1b04ef88ffb89c25db72bc0e8c5195468d2b00e1.tar.gz
bugzilla-1b04ef88ffb89c25db72bc0e8c5195468d2b00e1.tar.xz
Bug 511337: Make checksetup.pl properly throw a warning when it can't chmod/chown a file
Patch by Max Kanat-Alexander <mkanat@bugzilla.org> (module owner) a=mkanat
-rw-r--r--Bugzilla/Install/Filesystem.pm9
-rw-r--r--template/en/default/setup/strings.txt.pl2
2 files changed, 8 insertions, 3 deletions
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index 4cbbd57cc..fe9783805 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -30,6 +30,7 @@ use strict;
use Bugzilla::Constants;
use Bugzilla::Error;
use Bugzilla::Install::Localconfig;
+use Bugzilla::Install::Util qw(install_string);
use Bugzilla::Util;
use File::Find;
@@ -600,10 +601,12 @@ sub _fix_cvs_dirs {
sub _fix_perms {
my ($name, $owner, $group, $perms) = @_;
#printf ("Changing $name to %o\n", $perms);
- chown $owner, $group, $name
- || warn "Failed to change ownership of $name: $!";
+ chown $owner, $group, $name
+ or warn install_string('chown_failed', { path => $name,
+ error => $! }) . "\n";
chmod $perms, $name
- || warn "Failed to change permissions of $name: $!";
+ or warn install_string('chmod_failed', { path => $name,
+ error => $! }) . "\n";
}
sub _check_web_server_group {
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 4d91da60d..6766bac78 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -33,6 +33,8 @@
checking_dbd => 'Checking available perl DBD modules...',
checking_optional => 'The following Perl modules are optional:',
checking_modules => 'Checking perl modules...',
+ chmod_failed => '##path##: Failed to change permissions: ##error##',
+ chown_failed => '##path##: Failed to change ownership: ##error##',
commands_dbd => <<EOT,
YOU MUST RUN ONE OF THE FOLLOWING COMMANDS (depending on which database
you use):