[Box Backup-commit] COMMIT r2669 - box/RELEASE/0.11rc7/bin/bbackupquery

subversion at boxbackup.org subversion at boxbackup.org
Tue Mar 9 08:07:25 GMT 2010


Author: chris
Date: 2010-03-09 08:07:24 +0000 (Tue, 09 Mar 2010)
New Revision: 2669

Modified:
   box/RELEASE/0.11rc7/bin/bbackupquery/BackupQueries.cpp
Log:
Merge [2625] from trunk into 0.11rc7. Fix tests for comparing excluded 
files.


Modified: box/RELEASE/0.11rc7/bin/bbackupquery/BackupQueries.cpp
===================================================================
--- box/RELEASE/0.11rc7/bin/bbackupquery/BackupQueries.cpp	2010-03-08 22:16:13 UTC (rev 2668)
+++ box/RELEASE/0.11rc7/bin/bbackupquery/BackupQueries.cpp	2010-03-09 08:07:24 UTC (rev 2669)
@@ -1594,24 +1594,26 @@
 			std::string storeDirPath(rStoreDir + "/" +
 				localDirEn->d_name);
 
-			// Check whether dir is excluded before trying to
-			// stat it, to fix problems with .gvfs directories
-			// that are not readable by root causing compare
-			// to crash:
-			// http://lists.boxbackup.org/pipermail/boxbackup/2010-January/000013.html
-			if(rParams.IsExcludedDir(localDirPath))
-			{
-				rParams.NotifyExcludedDir(localDirPath,
-					storeDirPath);
-				continue;
-			}
-
 #ifndef HAVE_VALID_DIRENT_D_TYPE
 			EMU_STRUCT_STAT st;
 			if(EMU_LSTAT(localDirPath.c_str(), &st) != 0)
 			{
-			    THROW_EXCEPTION_MESSAGE(CommonException,
-				OSFileError, localDirPath);
+				// Check whether dir is excluded before trying
+				// to stat it, to fix problems with .gvfs
+				// directories that are not readable by root
+				// causing compare to crash:
+				// http://lists.boxbackup.org/pipermail/boxbackup/2010-January/000013.html
+				if(rParams.IsExcludedDir(localDirPath))
+				{
+					rParams.NotifyExcludedDir(localDirPath,
+						storeDirPath);
+					continue;
+				}
+				else
+				{
+					THROW_EXCEPTION_MESSAGE(CommonException,
+						OSFileError, localDirPath);
+				}
 			}
 			
 			// Entry -- file or dir?




More information about the Boxbackup-commit mailing list