diff options
| author | ramon <ramongomez@us.es> | 2014-03-18 13:38:12 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2014-03-18 13:38:12 +0000 |
| commit | fe10bff252071d5125aca01875b4d84349936b35 (patch) | |
| tree | e63f0e31aeb73b066790d43f2c5574fbf5a19128 /client/shared/scripts/deployImage | |
| parent | 167b8d58ab3303fe4cdc37a1809c477c85826b75 (diff) | |
#640: Más scripts adaptados al nuevo formato de la función {{{ogEcho}}}.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@4193 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/shared/scripts/deployImage')
| -rwxr-xr-x | client/shared/scripts/deployImage | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/client/shared/scripts/deployImage b/client/shared/scripts/deployImage index 08134cc2..1b2973e9 100755 --- a/client/shared/scripts/deployImage +++ b/client/shared/scripts/deployImage @@ -157,13 +157,13 @@ case "$NEXTOPERATION" in ;; esac RESUMERESTOREIMAGE=$(grep -m 1 "Total Time:" $OGLOGCOMMAND) -ogEcho log session " [ ] $RESUMERESTOREIMAGE " | tee -a $OGLOGSESSION $OGLOGFILE +ogEcho log session " [ ] $RESUMERESTOREIMAGE " # Si la transferencia ha dado error me salgo. if [ $RETVAL -ne 0 ] ; then - ogRaiseError session $OG_ERR_IMAGE "$REPO $IMGNAME" 2>&1 - # Muestro registro de fin de ejecución si no viene de Ejecutar Script - [ "$(ogGetCaller)" == "EjecutarScript" ] || ogEcho log session "$MSG_INTERFACE_END $OG_ERR_IMAGE" - exit $OG_ERR_IMAGE + ogRaiseError session $OG_ERR_IMAGE "$REPO $IMGNAME" 2>&1 + # Muestro registro de fin de ejecución si no viene de Ejecutar Script + [ "$(ogGetCaller)" == "EjecutarScript" ] || ogEcho log session "$MSG_INTERFACE_END $OG_ERR_IMAGE" + exit $OG_ERR_IMAGE fi TIME3=$[SECONDS-TIME3] ogEcho log session " [ ] $MSG_SCRIPTS_TIME_PARTIAL : $[TIME3/60]m $[TIME3%60]s" @@ -182,7 +182,7 @@ ogEcho log session "[100] $MSG_SCRIPTS_TIME_TOTAL $[TIME/60]m $[TIME%60]s" # Registro de fin de ejecución # Si se ha llamado desde ejecutar script no lo muestro para no repetir. if [ "$(ogGetCaller)" != "EjecutarScript" ] ; then - ogEcho log session "$MSG_INTERFACE_END $RETVAL" - exit $RETVAL + ogEcho log session "$MSG_INTERFACE_END $RETVAL" + exit $RETVAL fi |