[Box Backup-commit] COMMIT r3493 - box/trunk/lib/backupstore
subversion at boxbackup.org
subversion at boxbackup.org
Fri Dec 26 23:16:42 GMT 2014
Author: chris
Date: 2014-12-26 23:16:42 +0000 (Fri, 26 Dec 2014)
New Revision: 3493
Modified:
box/trunk/lib/backupstore/BackupStoreCheck.cpp
Log:
Fix test failures caused by store path ending with slash on Windows.
Modified: box/trunk/lib/backupstore/BackupStoreCheck.cpp
===================================================================
--- box/trunk/lib/backupstore/BackupStoreCheck.cpp 2014-12-26 23:16:39 UTC (rev 3492)
+++ box/trunk/lib/backupstore/BackupStoreCheck.cpp 2014-12-26 23:16:42 UTC (rev 3493)
@@ -287,12 +287,14 @@
{
// Make sure the starting root dir doesn't end with '/'.
std::string start(mStoreRoot);
- if(start.size() > 0 && start[start.size() - 1] == '/')
+ if(start.size() > 0 && (
+ start[start.size() - 1] == '/' ||
+ start[start.size() - 1] == DIRECTORY_SEPARATOR_ASCHAR))
{
start.resize(start.size() - 1);
}
- maxDir = CheckObjectsScanDir(0, 1, mStoreRoot);
+ maxDir = CheckObjectsScanDir(0, 1, start);
BOX_TRACE("Max dir starting ID is " <<
BOX_FORMAT_OBJECTID(maxDir));
}
More information about the Boxbackup-commit
mailing list