[Box Backup-commit] COMMIT r2898 - box/trunk/lib/backupstore

[subversion at boxbackup.org]

Author: chris
Date: 2011-03-27 21:39:17 +0100 (Sun, 27 Mar 2011)
New Revision: 2898

Modified:
   box/trunk/lib/backupstore/BackupStoreInfo.cpp
Log:
Fix double path separator in account info filename, prevents its deletion
on MSVC 2010/emu.cpp:unlink(). A cursory check shows that the separator
is always included by MakeAccountRootDir() and this is always used to make
the info filename, so this should not break anything.


Modified: box/trunk/lib/backupstore/BackupStoreInfo.cpp
===================================================================
--- box/trunk/lib/backupstore/BackupStoreInfo.cpp	2011-03-27 20:31:25 UTC (rev 2897)
+++ box/trunk/lib/backupstore/BackupStoreInfo.cpp	2011-03-27 20:39:17 UTC (rev 2898)
@@ -144,7 +144,7 @@
 std::auto_ptr<BackupStoreInfo> BackupStoreInfo::Load(int32_t AccountID, const std::string &rRootDir, int DiscSet, bool ReadOnly, int64_t *pRevisionID)
 {
 	// Generate the filename
-	std::string fn(rRootDir + DIRECTORY_SEPARATOR INFO_FILENAME);
+	std::string fn(rRootDir + INFO_FILENAME);
 	
 	// Open the file for reading (passing on optional request for revision ID)
 	std::auto_ptr<RaidFileRead> rf(RaidFileRead::Open(DiscSet, fn, pRevisionID));