[Pkg-owncloud-commits] [owncloud] 436/457: Merge pull request #16729 from owncloud/scanner-read-lock

[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 d2305f25278808d781fc8c44363e83adc7b71b9a
Merge: 3898b8c f02e110
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Jun 17 11:52:54 2015 +0200

    Merge pull request #16729 from owncloud/scanner-read-lock
    
    keep a read lock while scanning a file or folder

 apps/files_trashbin/lib/trashbin.php | 11 +++++++++++
 lib/private/connector/sabre/file.php |  9 ++++-----
 lib/private/files/cache/scanner.php  | 11 +++++++++++
 lib/private/files/view.php           | 20 ++++++++++++--------
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --cc lib/private/files/view.php
index 39e2fe6,d6c33d9..0a597ae
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@@ -1717,8 -1694,8 +1720,9 @@@ class View 
  	 * @throws \OCP\Lock\LockedException if the path is already locked
  	 */
  	public function changeLock($path, $type) {
+ 		$path = Filesystem::normalizePath($path);
  		$absolutePath = $this->getAbsolutePath($path);
 +		$absolutePath = Filesystem::normalizePath($absolutePath);
  		if (!$this->shouldLockFile($absolutePath)) {
  			return false;
  		}

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