Skip to content

Commit a480a31

Browse files
committed
Hardcode Desktop.ini in the exclude list
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.
1 parent 251f1d0 commit a480a31

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

csync/src/csync_exclude.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,13 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
293293
}
294294
#endif
295295

296+
/* We create a desktop.ini on Windows for the sidebar icon, make sure we don't sync them. */
297+
rc = csync_fnmatch("Desktop.ini", bname, 0);
298+
if (rc == 0) {
299+
match = CSYNC_FILE_SILENTLY_EXCLUDED;
300+
goto out;
301+
}
302+
296303
rc = csync_fnmatch(".owncloudsync.log*", bname, 0);
297304
if (rc == 0) {
298305
match = CSYNC_FILE_SILENTLY_EXCLUDED;

sync-exclude.lst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
].ds_store
99
._*
1010
]Thumbs.db
11-
desktop.ini
1211
System Volume Information
1312

1413
.*.sw?

0 commit comments

Comments
 (0)