projects
/
matthijs
/
upstream
/
backupninja-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug where multiple 'when' options were ignored.
[matthijs/upstream/backupninja-vserver.git]
/
backupninja
diff --git
a/backupninja
b/backupninja
index a1bfabc61e3d89336968e08a40a02afc059e02de..aba997e50a4de87e44f17728cbc19a051eaf6305 100755
(executable)
--- a/
backupninja
+++ b/
backupninja
@@
-271,7
+271,7
@@
EOF
function process_action() {
local file="$1"
local suffix="$2"
function process_action() {
local file="$1"
local suffix="$2"
-
+ local run="no"
setfile $file
# skip over this config if "when" option
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"
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)"
else
info ">>>> starting action $file (because it is $w)"
+ run="yes"
fi
done
IFS=$' \t\n'
fi
fi
done
IFS=$' \t\n'
fi
+ [ "$run" == "no" ] && return
let "actions_run += 1"
let "actions_run += 1"