[Pkg-owncloud-commits] [owncloud] 27/36: skip users that are not available anymore during sharing upgrade

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit e6bf1ca7b302514e6e138438a8eec37dee28c908
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Jun 23 09:42:42 2015 +0200

    skip users that are not available anymore during sharing upgrade
---
 apps/files_sharing/appinfo/update.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index e393b15..2d2d78a 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -87,8 +87,14 @@ function removeSharedFolder($mkdirs = true, $chunkSize = 99) {
 		// create folder Shared for each user
 
 		if ($mkdirs) {
+			$logger = \OC::$server->getLogger();
 			foreach ($unique_users as $user) {
-				\OC\Files\Filesystem::initMountPoints($user);
+				try {
+					\OC\Files\Filesystem::initMountPoints($user);
+				} catch(\OC\User\NoUserException $e) {
+					$logger->warning("Update: removeSharedFolder - user '$user' is not present anymore" , array('app' => 'files_sharing'));
+					continue;
+				}
 				if (!$view->file_exists('/' . $user . '/files/Shared')) {
 					$view->mkdir('/' . $user . '/files/Shared');
 				}

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