[Pkg-owncloud-commits] [owncloud-client] 56/103: Updater: Ignore files matching with CSYNC_CONFLICT_FILE_USERNAME

[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 94f380c1f07707e0a155dd6f8fe15dabc5fcdf8b
Author: Markus Goetz <markus at woboq.com>
Date:   Tue Apr 22 17:05:59 2014 +0200

    Updater: Ignore files matching with CSYNC_CONFLICT_FILE_USERNAME
---
 csync/src/csync_exclude.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/csync/src/csync_exclude.c b/csync/src/csync_exclude.c
index 94d8128..0c33988 100644
--- a/csync/src/csync_exclude.c
+++ b/csync/src/csync_exclude.c
@@ -144,6 +144,7 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
   char *bname = NULL;
   char *dname = NULL;
   char *prev_dname = NULL;
+  char *conflict = NULL;
   int rc = -1;
   CSYNC_EXCLUDE_TYPE match = CSYNC_NOT_EXCLUDED;
   CSYNC_EXCLUDE_TYPE type  = CSYNC_NOT_EXCLUDED;
@@ -200,6 +201,19 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
       goto out;
   }
 
+  if (getenv("CSYNC_CONFLICT_FILE_USERNAME")) {
+      asprintf(&conflict, "*_conflict_%s-*", getenv("CSYNC_CONFLICT_FILE_USERNAME"));
+      rc = csync_fnmatch(conflict, path, 0);
+      if (rc == 0) {
+          match = CSYNC_FILE_SILENTLY_EXCLUDED;
+          SAFE_FREE(conflict);
+          SAFE_FREE(bname);
+          SAFE_FREE(dname);
+          goto out;
+      }
+      SAFE_FREE(conflict);
+  }
+
   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