Skip to content

Commit

Permalink
Hardcode Desktop.ini in the exclude list
Browse files Browse the repository at this point in the history
This prevents it from being removed from the exclude list, which
would be an issue since the client itself creates this file in a way
that wouldn't match on machines with different installation paths.
  • Loading branch information
jturcotte committed Aug 15, 2017
1 parent 251f1d0 commit a480a31
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
7 changes: 7 additions & 0 deletions csync/src/csync_exclude.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,13 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
}
#endif

/* We create a desktop.ini on Windows for the sidebar icon, make sure we don't sync them. */
rc = csync_fnmatch("Desktop.ini", bname, 0);
if (rc == 0) {
match = CSYNC_FILE_SILENTLY_EXCLUDED;
goto out;
}

rc = csync_fnmatch(".owncloudsync.log*", bname, 0);
if (rc == 0) {
match = CSYNC_FILE_SILENTLY_EXCLUDED;
Expand Down
1 change: 0 additions & 1 deletion sync-exclude.lst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
].ds_store
._*
]Thumbs.db
desktop.ini
System Volume Information

.*.sw?
Expand Down

0 comments on commit a480a31

Please sign in to comment.