X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=backupninja;h=7bd35416788b126caad90d1552315c2ba5c44141;hb=b5120bcd7b12047e802a8067f2275f0d3d2ebeba;hp=a1bfabc61e3d89336968e08a40a02afc059e02de;hpb=67b5cf70d7a48bf9333e448b0d1ca53aacc252ea;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/backupninja b/backupninja
index a1bfabc..7bd3541 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
@@ -279,8 +279,10 @@ function process_action() {
 	getconf when "$defaultwhen"
 	if [ "$processnow" == 1 ]; then
 		info ">>>> starting action $file (because of --now)"
+		run="yes"
 	elif [ "$when" == "hourly" ]; then
 		info ">>>> starting action $file (because 'when = hourly')"
+		run="yes"
 	else
 		IFS=$'\t\n'
 		for w in $when; do
@@ -290,13 +292,15 @@ 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
+	debug $run
+	[ "$run" == "no" ] && return
 	
 	let "actions_run += 1"