From: elijah <elijah@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Tue, 26 Jul 2005 23:05:17 +0000 (+0000)
Subject: fixed bug where multiple 'when' options were ignored.
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=4c16a5f257640c7ed9dd9ab98a8371cbd8cd3f65;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

fixed bug where multiple 'when' options were ignored.


git-svn-id: http://code.autistici.org/svn/backupninja/trunk@149 758a04ac-41e6-0310-8a23-8373a73cc35d
---

diff --git a/backupninja b/backupninja
index a1bfabc..aba997e 100755
--- a/backupninja
+++ b/backupninja
@@ -271,7 +271,7 @@ EOF
 function process_action() {
 	local file="$1"
 	local suffix="$2"
-
+	local run="no"
 	setfile $file
 
 	# skip over this config if "when" option
@@ -290,13 +290,14 @@ function process_action() {
 			IFS=$'\t\n'
 			if [ $ret == 0 ]; then
 				debug "skipping $file because it is not $w"
-				return
 			else
 				info ">>>> starting action $file (because it is $w)"
+				run="yes"
 			fi
 		done
 		IFS=$' \t\n'
 	fi
+	[ "$run" == "no" ] && return
 	
 	let "actions_run += 1"