[Box Backup-dev] COMMIT r485 - box/chris/general/bin/bbackupd

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-02-22 23:37:11 +0000 (Wed, 22 Feb 2006)
New Revision: 485

Modified:
   box/chris/general/bin/bbackupd/BackupDaemon.cpp
Log:
* BackupDaemon.cpp
- Make sure that if the backup fails by throwing an exception, after the
  store info object file is deleted and before it's recreated, we don't
  try to delete it again, since we won't be able to and subsequent backups
  will not work.


Modified: box/chris/general/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/chris/general/bin/bbackupd/BackupDaemon.cpp	2006-02-21 21:16:45 UTC (rev 484)
+++ box/chris/general/bin/bbackupd/BackupDaemon.cpp	2006-02-22 23:37:11 UTC (rev 485)
@@ -692,6 +692,11 @@
 					"continue safely.");
 				continue;
 			}
+
+			// In case the backup throws an exception,
+			// we should not try to delete the store info
+			// object file again.
+			deserialised = false;
 			
 			// Do sync
 			bool errorOccurred = false;
@@ -802,6 +807,9 @@
 
 				// We had a successful backup, save the store info
 				SerializeStoreObjectInfo(clientStoreMarker, lastSyncTime, nextSyncTime);
+				// Next time around, make sure we delete
+				// the store info object file.
+				deserialised = true;
 
 				// --------------------------------------------------------------------------------------------
 			}