[Pkg-owncloud-commits] [owncloud-client] 90/175: Recall: make it work even if it is not in the root directory

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 289800c1ba7a0aecfc230cadadc3b47c14828761
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri May 15 17:05:40 2015 +0200

    Recall: make it work even if it is not in the root directory
---
 csync/tests/ownCloud/t_recall.pl  | 7 +++++++
 src/libsync/propagatedownload.cpp | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/csync/tests/ownCloud/t_recall.pl b/csync/tests/ownCloud/t_recall.pl
index 6c5ca00..008cad8 100755
--- a/csync/tests/ownCloud/t_recall.pl
+++ b/csync/tests/ownCloud/t_recall.pl
@@ -72,6 +72,13 @@ csync();
 
 assertLocalAndRemoteDir( '', 0);
 
+printInfo( "Testing with a dir/.sys.admin#recall#" );
+system("echo 'file4.dat' > ". $tmpdir . ".sys.admin\#recall\#");
+glob_put( "$tmpdir/.sys.admin\#recall\#", "dir" );
+
+csync();
+assert( -e glob(localDir().'dir/file4_.sys.admin#recall#-*.dat' ) );
+
 
 cleanup();
 system("rm -r " . $tmpdir);
diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index 256a170..9e99e15 100644
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -630,7 +630,7 @@ void PropagateDownloadFileQNAM::downloadFinished()
     done(isConflict ? SyncFileItem::Conflict : SyncFileItem::Success);
 
     // handle the special recall file
-    if(_item._file == QLatin1String(".sys.admin#recall#")) {
+    if(_item._file == QLatin1String(".sys.admin#recall#") || _item._file.endsWith("/.sys.admin#recall#")) {
         FileSystem::setFileHidden(fn, true);
 
         QFileInfo existingFile(fn);

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