summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2010-10-07 13:50:42 +0000
committerChris Wilson <chris+github@qwirx.com>2010-10-07 13:50:42 +0000
commit6626255ec81125298a726ed9b8996c3a38ed6936 (patch)
tree11a8248601d422e17910ce1d0d853198455f961a /bin
parentc774d967dd5392615b5fde65177cc9f0ca0ec8fb (diff)
Quick fix to stop deletion of redundant locations when
DeleteRedundantLocationsAfter is set to zero, which is supposed to mean that it's disabled.
Diffstat (limited to 'bin')
-rw-r--r--bin/bbackupd/BackupDaemon.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp
index e0063494..ed3861ae 100644
--- a/bin/bbackupd/BackupDaemon.cpp
+++ b/bin/bbackupd/BackupDaemon.cpp
@@ -1731,7 +1731,14 @@ void BackupDaemon::SetupLocations(BackupClientContext &rClientContext, const Con
}
// 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();