[Box Backup-commit] COMMIT r2785 - box/RELEASE/0.11/bin/bbackupd

[subversion at boxbackup.org]

Author: chris
Date: 2010-10-07 14:51:24 +0100 (Thu, 07 Oct 2010)
New Revision: 2785

Modified:
   box/RELEASE/0.11/bin/bbackupd/BackupDaemon.cpp
Log:
Quick fix to stop deletion of redundant locations when 
DeleteRedundantLocationsAfter is set to zero, which is supposed to mean 
that it's disabled. (thanks to Achim for noticing) (backport to 0.11 
branch).


Modified: box/RELEASE/0.11/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/RELEASE/0.11/bin/bbackupd/BackupDaemon.cpp	2010-10-07 13:50:42 UTC (rev 2784)
+++ box/RELEASE/0.11/bin/bbackupd/BackupDaemon.cpp	2010-10-07 13:51:24 UTC (rev 2785)
@@ -1731,8 +1731,15 @@
 	}
 	
 	// Any entries in the root directory which need deleting?
-	if(dir.GetNumberOfEntries() > 0)
+	if(dir.GetNumberOfEntries() > 0 &&
+		mDeleteRedundantLocationsAfter == 0)
 	{
+		BOX_NOTICE(dir.GetNumberOfEntries() << " redundant locations "
+			"in root directory found, but will not delete because "
+			"DeleteRedundantLocationsAfter = 0");
+	}
+	else if(dir.GetNumberOfEntries() > 0)
+	{
 		box_time_t now = GetCurrentBoxTime();
 
 		// This should reset the timer if the list of unused