[Pkg-owncloud-commits] [owncloud] 43/50: Show a proper error message when trying to scan the filesystem for a non existing user

David Prévot taffit at moszumanska.debian.org
Fri Oct 17 03:12:15 UTC 2014


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

taffit pushed a commit to annotated tag v6.0.6RC1
in repository owncloud.

commit dfa57cdc013c47c2b51bcc3b037c9222a92e86cf
Author: Robin Appelman <icewind at owncloud.com>
Date:   Wed Sep 24 15:48:54 2014 +0200

    Show a proper error message when trying to scan the filesystem for a non existing user
    
    Backport of e8280c80da52399594ba116ef78bddf16b9e7f25 from master
---
 apps/files/command/scan.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/files/command/scan.php b/apps/files/command/scan.php
index 5fc6325..cd90e3f 100644
--- a/apps/files/command/scan.php
+++ b/apps/files/command/scan.php
@@ -68,7 +68,11 @@ class Scan extends Command {
 			if (is_object($user)) {
 				$user = $user->getUID();
 			}
-			$this->scanFiles($user, $output);
+			if ($this->userManager->userExists($user)) {
+				$this->scanFiles($user, $output);
+			} else {
+				$output->writeln("<error>Unknown user $user</error>");
+			}
 		}
 	}
 }

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



More information about the Pkg-owncloud-commits mailing list