[Box Backup-commit] COMMIT r2712 - box/RELEASE/0.11rc8/bin/bbackupd

[subversion at boxbackup.org]

Author: chris
Date: 2010-08-27 18:26:05 +0100 (Fri, 27 Aug 2010)
New Revision: 2712

Modified:
   box/RELEASE/0.11rc8/bin/bbackupd/BackupClientDirectoryRecord.cpp
Log:
Don't back up sockets and pipes, thanks to Mick Kappenburg for spotting 
that the fix for Debian bug was incorrect. (merges [2693] from trunk)


Modified: box/RELEASE/0.11rc8/bin/bbackupd/BackupClientDirectoryRecord.cpp
===================================================================
--- box/RELEASE/0.11rc8/bin/bbackupd/BackupClientDirectoryRecord.cpp	2010-08-27 17:18:12 UTC (rev 2711)
+++ box/RELEASE/0.11rc8/bin/bbackupd/BackupClientDirectoryRecord.cpp	2010-08-27 17:26:05 UTC (rev 2712)
@@ -364,15 +364,15 @@
 					// Store on list
 					dirs.push_back(std::string(en->d_name));
 				}
-				else if (type == S_IFSOCK || type == S_IFIFO)
-				{
-					// removed notification for these types
-					// see Debian bug 479145, no objections
-				}
 				else
 				{
-					if(rParams.mrContext.ExcludeFile(filename))
+					if (type == S_IFSOCK || type == S_IFIFO)
 					{
+						// removed notification for these types
+						// see Debian bug 479145, no objections
+					}
+					else if(rParams.mrContext.ExcludeFile(filename))
+					{
  						rNotifier.NotifyFileExcluded(
 								this, 
 								filename);