From 6060feda9662186b87b91315216b5f51793f326a Mon Sep 17 00:00:00 2001
From: Kevin Rocard <kevinx.rocard@intel.com>
Date: Thu, 14 Nov 2013 10:28:56 +0100
Subject: [xml generation] Ignore errors in clean up

BZ: 152121

As the hostDomainGenerator clean up function can be called after any
command, some clean commands were sometime irrelevant.

Clean commands should not fail.

Change-Id: I0e472919cd77abe393bca090a95d1c72cf77d58c
Signed-off-by: Kevin Rocard <kevinx.rocard@intel.com>
---
 tools/xmlGenerator/hostDomainGenerator.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/xmlGenerator/hostDomainGenerator.sh b/tools/xmlGenerator/hostDomainGenerator.sh
index 8cc815a..eeaf7a8 100755
--- a/tools/xmlGenerator/hostDomainGenerator.sh
+++ b/tools/xmlGenerator/hostDomainGenerator.sh
@@ -85,12 +85,15 @@ export LD_LIBRARY_PATH="$HostRoot/lib:${LD_LIBRARY_PATH:-}"
 clean_up () {
     status=$?
 
-    echo "Clean sub process: $testPlatformPID"
-    test $testPlatformPID != 0 && kill $testPlatformPID 2>&1
-    rm "$tmpFile"
+    if test $testPlatformPID != 0
+    then
+        echo "Clean sub process: $testPlatformPID"
+        kill $testPlatformPID 2>&1
+    fi
+    rm "$tmpFile" || true
 
     # Delete the lockfile
-    rm -f $lockFile
+    rm -f $lockFile || true
 
     return $status
 }
-- 
cgit v1.1