[Pkg-owncloud-commits] [ocsync] 04/29: Set the symlink error message only for links.

[Sandro Knauß]

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

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

commit d99f5c5ddba1cf7ab1bd3a4dfedf6e056b2c139f
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Dec 6 14:06:38 2013 +0100

    Set the symlink error message only for links.
---
 src/csync_update.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/csync_update.c b/src/csync_update.c
index 352e6a0..6792ac5 100644
--- a/src/csync_update.c
+++ b/src/csync_update.c
@@ -193,8 +193,10 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
     goto out;
   }
   if (excluded > CSYNC_NOT_EXCLUDED || type == CSYNC_FTW_TYPE_SLINK) {
-      st->error_status = CSYNC_STATUS_INDIVIDUAL_IS_SYMLINK; /* Symbolic links are ignored. */
-    st->instruction = CSYNC_INSTRUCTION_IGNORE;
+      if( type == CSYNC_FTW_TYPE_SLINK ) {
+          st->error_status = CSYNC_STATUS_INDIVIDUAL_IS_SYMLINK; /* Symbolic links are ignored. */
+      }
+      st->instruction = CSYNC_INSTRUCTION_IGNORE;
     goto out;
   }
 

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