From dabcafa2d911583f11cb264d31b4e5a9e1dd2c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Tue, 6 Mar 2012 18:07:14 +0100
Subject: [PATCH] Feature #1112: Fix exec_and_log functions

---
 src/mad/sh/scripts_common.sh | 2 +-
 src/tm_mad/tm_common.sh      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh
index b60c15d8a7..365a6a410e 100755
--- a/src/mad/sh/scripts_common.sh
+++ b/src/mad/sh/scripts_common.sh
@@ -121,7 +121,7 @@ function exec_and_log
         else
             error_message "Error executing $1: $EXEC_LOG_ERR"
         fi
-        exit $code
+        exit $EXEC_LOG_RC
     fi
 }
 
diff --git a/src/tm_mad/tm_common.sh b/src/tm_mad/tm_common.sh
index 6626ef591f..4c8c721ba9 100644
--- a/src/tm_mad/tm_common.sh
+++ b/src/tm_mad/tm_common.sh
@@ -88,9 +88,8 @@ $2
 EOF`
     SSH_EXEC_RC=$?
 
-    if [ $? -ne 0 ]; then
-        log_error "Command $2 failed"
-        log_error "$SSH_EXEC_ERR"
+    if [ $SSH_EXEC_RC -ne 0 ]; then
+        log_error "Command \"$2\" failed: $SSH_EXEC_ERR"
 
         if [ -n "$3" ]; then
             error_message "$3"