Changeset 2661

Timestamp:

08/03/2010 21:35:19 (2 years ago)

Author:

chris

Message:

Merge [2601] [2602] [2603] from trunk into 0.11rc7. Don't try to stat
excluded directories during compare, reported by Ben Bennett.

Location:

box/RELEASE/0.11rc7

Files:

• bin/bbackupquery/BackupQueries.cpp (modified) (1 diff)
• lib/common/Box.h (modified) (1 diff)

box/RELEASE/0.11rc7/bin/bbackupquery/BackupQueries.cpp

@@ -1545 +1545 @@
                         }
 
+                        std::string localDirPath(MakeFullPath(rLocalDir,
+                                localDirEn->d_name));
+                        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
-                        std::string fn(MakeFullPath
-                                (rLocalDir, localDirEn->d_name));
                         EMU_STRUCT_STAT st;
-                        if(EMU_LSTAT(fn.c_str(), &st) != 0)
-                        {
-                            THROW_EXCEPTION(CommonException, OSFileError)
+                        if(EMU_LSTAT(localDirPath.c_str(), &st) != 0)
+                        {
+                            THROW_EXCEPTION_MESSAGE(CommonException,
+                                OSFileError, localDirPath);
                         }
                         

box/RELEASE/0.11rc7/lib/common/Box.h

@@ -120 +120 @@
                         OPTIONAL_DO_BACKTRACE \
                         BOX_WARNING("Exception thrown: " \
-                                #type "(" #subtype ") (" message ") at " \
-                                __FILE__ "(" << __LINE__ << ")") \
+                                #type "(" #subtype ") (" << message << \
+                                ") at " __FILE__ "(" << __LINE__ << ")") \
                 } \
                 throw type(type::subtype, message); \