[Pkg-owncloud-commits] [owncloud-client] 66/333: Ignore conflict files all the time

[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 141f005c342a0aa3ab88fbf2d066f9eb25925bf2
Author: Markus Goetz <markus at woboq.com>
Date:   Wed Feb 19 17:16:10 2014 +0100

    Ignore conflict files all the time
    
    The OwncloudCmd currently does not load the exclude files.
    It is safer to just always ignore conflict files.
---
 csync/src/csync_exclude.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/csync/src/csync_exclude.c b/csync/src/csync_exclude.c
index 4378be5..4e21b22 100644
--- a/csync/src/csync_exclude.c
+++ b/csync/src/csync_exclude.c
@@ -188,6 +188,15 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
   SAFE_FREE(bname);
   SAFE_FREE(dname);
 
+  /* Always ignore conflict files, not only via the exclude list */
+  rc = csync_fnmatch("*_conflict-*", bname, 0);
+  if (rc == 0) {
+      match = CSYNC_FILE_SILENTLY_EXCLUDED;
+      SAFE_FREE(bname);
+      SAFE_FREE(dname);
+      goto out;
+  }
+
   SAFE_FREE(bname);
   SAFE_FREE(dname);
 

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