Changeset 2625 for box/trunk/bin/bbackupquery/BackupQueries.cpp

Timestamp:

21/02/2010 22:09:37 (2 years ago)

Author:

chris

Message:

Move the test for excluded dirs inside the emu_lstat failure, as
otherwise we don't know whether the file that we couldn't stat was
really a file or a directory, so we can't know whether it should have
been excluded, and the old code allowed dir excludes to make files
appear not to exist locally, and therefore tests to fail.

File:

• box/trunk/bin/bbackupquery/BackupQueries.cpp (modified) (1 diff)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -1550 +1550 @@
                                 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);
+                                }
                         }