diff options
author | Chris Wilson <chris+github@qwirx.com> | 2014-12-24 13:02:26 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2014-12-24 13:02:26 +0000 |
commit | 1ca8e7a4ad9b25df50a98a1b5472d4858c72dafa (patch) | |
tree | 2f87d98b0b426d00c9931089367b61218c4640ae /bin | |
parent | 73e7ecdaa501871da4c820d0578bc88aaf03b060 (diff) |
Allow excluding files of unknown type using either ExcludeFile or ExcludeDir.
Diffstat (limited to 'bin')
-rw-r--r-- | bin/bbackupd/BackupClientDirectoryRecord.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp index 691fd1c0..7334af14 100644 --- a/bin/bbackupd/BackupClientDirectoryRecord.cpp +++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp @@ -453,7 +453,11 @@ bool BackupClientDirectoryRecord::SyncDirectoryEntry( #else // !WIN32 if(EMU_LSTAT(filename.c_str(), &file_st) != 0) { - if(!(rParams.mrContext.ExcludeDir(filename))) + // We don't know whether it's a file or a directory, so check + // both. This only affects whether a warning message is + // displayed; the file is not backed up in either case. + if(!(rParams.mrContext.ExcludeFile(filename)) && + !(rParams.mrContext.ExcludeDir(filename))) { // Report the error (logs and eventual email to // administrator) |