[Box Backup-commit] COMMIT r1817 - box/chris/general/bin/bbackupd

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-09-07 21:38:19 +0100 (Fri, 07 Sep 2007)
New Revision: 1817

Modified:
   box/chris/general/bin/bbackupd/BackupDaemon.cpp
Log:
Handle missing NotifyScript configuration key properly.


Modified: box/chris/general/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/chris/general/bin/bbackupd/BackupDaemon.cpp	2007-09-07 20:07:42 UTC (rev 1816)
+++ box/chris/general/bin/bbackupd/BackupDaemon.cpp	2007-09-07 20:38:19 UTC (rev 1817)
@@ -2264,14 +2264,15 @@
 
 	// Is there a notifation script?
 	const Configuration &conf(GetConfiguration());
-	if(!conf.KeyExists("NotifyScript") &&
-		Event != NotifyEvent_BackupStart &&
-		Event != NotifyEvent_BackupFinish)
+	if(!conf.KeyExists("NotifyScript"))
 	{
-		// Log, and then return
-		BOX_ERROR("Not notifying administrator about event "
-			<< sEventNames[Event] << " -- set NotifyScript "
-			"to do this in future");
+		if(Event != NotifyEvent_BackupStart &&
+			Event != NotifyEvent_BackupFinish))
+		{
+			BOX_ERROR("Not notifying administrator about event "
+				<< sEventNames[Event] << " -- set NotifyScript "
+				"to do this in future");
+		}
 		return;
 	}