summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-09-14 14:26:41 +0200
committerGitHub <noreply@github.com>2016-09-14 14:26:41 +0200
commitc5189a93db706461bca2e726a25a889811a14e42 (patch)
tree02b07132c1a9ae38e8bf446a8764e709b377dc9c /core
parentafddb138d941c26be0588b20d7b8d61524d86bf4 (diff)
parent4b26d7d86a6f08c4e2aabc86472c8133f36cf103 (diff)
downloadnextcloud-server-c5189a93db706461bca2e726a25a889811a14e42.tar.gz
nextcloud-server-c5189a93db706461bca2e726a25a889811a14e42.zip
Merge pull request #1375 from nextcloud/display-that-updating-failed-for-htaccess
Display an error when updating .htaccess failed
Diffstat (limited to 'core')
-rw-r--r--core/Command/Maintenance/UpdateHtaccess.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php
index 21850786200..89eeb7ccf5b 100644
--- a/core/Command/Maintenance/UpdateHtaccess.php
+++ b/core/Command/Maintenance/UpdateHtaccess.php
@@ -38,8 +38,12 @@ class UpdateHtaccess extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
- \OC\Setup::updateHtaccess();
- $output->writeln('.htaccess has been updated');
- return 0;
+ if (\OC\Setup::updateHtaccess()) {
+ $output->writeln('.htaccess has been updated');
+ return 0;
+ } else {
+ $output->writeln('<error>Error updating .htaccess file, not enough permissions?</error>');
+ return 1;
+ }
}
}