[Pkg-owncloud-commits] [owncloud-client] 165/484: Fix compile after pull request merge

Sandro Knauß hefee-guest at moszumanska.debian.org
Wed Dec 16 00:37:34 UTC 2015


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 d2e5ba123ddfa45bed6d922172300f05fd4abead
Author: Christian Kamm <mail at ckamm.de>
Date:   Wed Oct 28 09:53:06 2015 +0100

    Fix compile after pull request merge
    
    It conflicted with the optimization in
    f18b40f7e7890a659d20f1d3bbd3125a3089b612
---
 csync/src/csync_update.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/csync/src/csync_update.c b/csync/src/csync_update.c
index 4945d44..e25af51 100644
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -747,7 +747,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
      */
 #ifndef _WIN32
     if( d_name[0] == '.' ) {
-        fs->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
+        dirent->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
     }
 #endif
 

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



More information about the Pkg-owncloud-commits mailing list