[Box Backup-commit] COMMIT r3389 - box/trunk/bin/bbackupd

[subversion at boxbackup.org]

Author: chris
Date: 2014-09-04 02:36:41 +0100 (Thu, 04 Sep 2014)
New Revision: 3389

Modified:
   box/trunk/bin/bbackupd/BackupDaemon.cpp
Log:
Allow changing exclude lists when reconfiguring BackupDaemon.

Some tests need to do this. I don't think it happens in normal use,
because the daemon's response to HUP takes a different path, I think.

Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp	2014-09-04 01:36:39 UTC (rev 3388)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp	2014-09-04 01:36:41 UTC (rev 3389)
@@ -2442,12 +2442,12 @@
 				// Setup names in the location record
 				pLoc->mName = *pLocName;
 				pLoc->mPath = rConfig.GetKeyValue("Path");
-				
-				// Read the exclude lists from the Configuration
-				pLoc->mapExcludeFiles.reset(BackupClientMakeExcludeList_Files(rConfig));
-				pLoc->mapExcludeDirs.reset(BackupClientMakeExcludeList_Dirs(rConfig));
 			}
 
+			// Read the exclude lists from the Configuration
+			pLoc->mapExcludeFiles.reset(BackupClientMakeExcludeList_Files(rConfig));
+			pLoc->mapExcludeDirs.reset(BackupClientMakeExcludeList_Dirs(rConfig));
+
 			// Does this exist on the server?
 			// Remove from dir object early, so that if we fail
 			// to stat the local directory, we still don't