From: Pierre Gueth <pierre.gueth@creatis.insa-lyon.fr>
Date: Wed, 5 Dec 2012 14:30:08 +0000 (+0100)
Subject: root merge warning to error
X-Git-Tag: v1.4.0~177^2~9
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0bc68ee21058f6e436888bc816f23a28b77644f9;p=clitk.git

root merge warning to error
---

diff --git a/cluster_tools/gate_power_merge.sh b/cluster_tools/gate_power_merge.sh
index 44a41c0..2ffad4b 100755
--- a/cluster_tools/gate_power_merge.sh
+++ b/cluster_tools/gate_power_merge.sh
@@ -130,7 +130,7 @@ do
     let count++
     local arguments=" -i ${partial} ${arguments}"
 done
-${rootMerger} ${arguments} > /dev/null || warning "error while calling ${rootMerger}"
+${rootMerger} ${arguments} > /dev/null || error "error while calling ${rootMerger}"
 echo "  ${indent}merged ${count} files"
 }
 
@@ -379,7 +379,7 @@ function merge_dispatcher {
     error "unknown file type"
 }
 
-echo "!!!! this is $0 v0.3j !!!!"
+echo "!!!! this is $0 v0.3k !!!!"
 
 rundir="${1?"provide run dir"}"
 rundir="$(echo "${rundir}" | sed 's|/*$||')"