projects
/
carnet-upgrade.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
91a2e67
)
Changed logging format.
author
Valentin Vidic
<vvidic@carnet.hr>
Fri, 14 Dec 2007 12:56:41 +0000
(13:56 +0100)
committer
Valentin Vidic
<vvidic@carnet.hr>
Fri, 14 Dec 2007 12:56:41 +0000
(13:56 +0100)
usr/share/carnet-upgrade/functions.sh
patch
|
blob
|
history
diff --git
a/usr/share/carnet-upgrade/functions.sh
b/usr/share/carnet-upgrade/functions.sh
index
4388ae6
..
3c179a1
100644
(file)
--- a/
usr/share/carnet-upgrade/functions.sh
+++ b/
usr/share/carnet-upgrade/functions.sh
@@
-225,11
+225,11
@@
run_actions() {
test=$(echo "$line" | sed 's/ */ /g'| awk -F' ' '{print $1}')
action=$(echo "$line" | sed 's/ */ /g'| awk -F' ' '{print $2}')
if eval $test; then
test=$(echo "$line" | sed 's/ */ /g'| awk -F' ' '{print $1}')
action=$(echo "$line" | sed 's/ */ /g'| awk -F' ' '{print $2}')
if eval $test; then
- log "$(printf '%02d' $lineno) starting ${action}(), (test $test passed)"
+ log "$(printf 'action %02d' $lineno) starting: '${action}' if '$test'"
eval $action
eval $action
- log "$(printf '%02d' $lineno) finished ${action}()"
+ log "$(printf 'action %02d' $lineno) finished: '${action}'"
else
else
- log "$(printf '%02d' $lineno) skipping ${action}(), (test $test failed)"
+ log "$(printf 'action %02d' $lineno) skipping: '${action}' if '$test'"
fi
[ "$lineno2" -gt "$lineno" ] && lineno=$lineno2
done
fi
[ "$lineno2" -gt "$lineno" ] && lineno=$lineno2
done