From: Feng Pan <fpan@redhat.com>
Date: Fri, 27 May 2016 00:23:24 +0000 (-0400)
Subject: Add library sourcing error check
X-Git-Tag: colorado.1.0~206^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=eafd7cfc494b81e478ad32ce235fbd3c25523769;p=apex.git

Add library sourcing error check

Change-Id: Ief7fd339fa2ca8661c8e157270aa9b0339d3b637
Signed-off-by: Feng Pan <fpan@redhat.com>
---

diff --git a/ci/clean.sh b/ci/clean.sh
index ac958f6a..b898fc9c 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -18,7 +18,10 @@ RESOURCES=${RESOURCES:-"$CONFIG/images"}
 LIB=${LIB:-"$CONFIG/lib"}
 
 ##LIBRARIES
-source $LIB/common-functions.sh
+if ! source $LIB/common-functions.sh; then
+  echo "Failed to source $LIB/common-functions.sh"
+  exit 1
+fi
 
 vm_index=4
 ovs_bridges="br-admin br-private br-public br-storage"
diff --git a/ci/deploy.sh b/ci/deploy.sh
index bb4c1f81..97ab0e55 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -55,9 +55,17 @@ ext_net_type="interface"
 ip_address_family=4
 
 # Libraries
-source $LIB/common-functions.sh
-source $LIB/utility-functions.sh
-source $LIB/installer/onos/onos_gw_mac_update.sh
+lib_files=(
+$LIB/common-functions.sh
+$LIB/utility-functions.sh
+$LIB/installer/onos/onos_gw_mac_update.sh
+)
+for lib_file in ${lib_files[@]}; do
+  if ! source $lib_file; then
+    echo -e "${red}ERROR: Failed to source $lib_file${reset}"
+    exit 1
+  fi
+done
 
 ##FUNCTIONS
 ##translates yaml into variables