[Pkg-owncloud-commits] [owncloud] 161/215: default to an empty string for database password if ommited

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit b0d1d61db2b9a5eda23e4e496bcacad861ed5774
Author: Bernhard Posselt <dev at bernhard-posselt.com>
Date:   Wed Apr 29 12:15:40 2015 +0200

    default to an empty string for database password if ommited
    
    fix null passwords
    
    remove password trimming
---
 core/command/maintenance/install.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/command/maintenance/install.php b/core/command/maintenance/install.php
index d55bc0b..361e631 100644
--- a/core/command/maintenance/install.php
+++ b/core/command/maintenance/install.php
@@ -49,7 +49,7 @@ class Install extends Command {
 			->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
 			->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
 			->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
-			->addOption('database-pass', null, InputOption::VALUE_REQUIRED, 'Password of the database user')
+			->addOption('database-pass', null, InputOption::VALUE_REQUIRED, 'Password of the database user', null)
 			->addOption('database-table-prefix', null, InputOption::VALUE_OPTIONAL, 'Prefix for all tables (default: oc_)', null)
 			->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin')
 			->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
@@ -102,6 +102,9 @@ class Install extends Command {
 			$dbTablePrefix = (string) $input->getOption('database-table-prefix');
 			$dbTablePrefix = trim($dbTablePrefix);
 		}
+		if ($input->hasParameterOption('--database-pass')) {
+			$dbPass = (string) $input->getOption('database-pass');
+		}
 		$adminLogin = $input->getOption('admin-user');
 		$adminPassword = $input->getOption('admin-pass');
 		$dataDir = $input->getOption('data-dir');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git