From: Valentin Vidic <vvidic@carnet.hr>
Date: Fri, 14 Dec 2007 12:56:41 +0000 (+0100)
Subject: Changed logging format.
X-Git-Tag: debian/4.0.1~102
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=537d173be1b7f9bea2e605b026b762ddd3e7d268;p=carnet-upgrade.git

Changed logging format.
---

diff --git a/usr/share/carnet-upgrade/functions.sh b/usr/share/carnet-upgrade/functions.sh
index 4388ae6..3c179a1 100644
--- 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
-      log "$(printf '%02d' $lineno) starting ${action}(), (test $test passed)"
+      log "$(printf 'action %02d' $lineno) starting: '${action}' if '$test'"
       eval $action
-      log "$(printf '%02d' $lineno) finished ${action}()"
+      log "$(printf 'action %02d' $lineno) finished: '${action}'"
     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