[Box Backup-commit] COMMIT r3479 - box/trunk/bin/bbackupd

[subversion at boxbackup.org]

Author: chris
Date: 2014-12-24 13:02:26 +0000 (Wed, 24 Dec 2014)
New Revision: 3479

Modified:
   box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
Log:
Allow excluding files of unknown type using either ExcludeFile or ExcludeDir.

Modified: box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp	2014-12-24 13:02:21 UTC (rev 3478)
+++ box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp	2014-12-24 13:02:26 UTC (rev 3479)
@@ -453,7 +453,11 @@
 #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)