diff mbox

[Xen-devel,OSSTEST] standalone: Handle multiple configuration files.

Message ID 1415184084-14650-1-git-send-email-ian.campbell@citrix.com
State New
Headers show

Commit Message

Ian Campbell Nov. 5, 2014, 10:41 a.m. UTC
OSSTEST_CONFIG can actually be a colon separate list of files, so take this
into account when sanity checking it.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 standalone | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

Comments

Ian Jackson Nov. 5, 2014, 11:43 a.m. UTC | #1
Ian Campbell writes ("[PATCH OSSTEST] standalone: Handle multiple configuration files."):
> OSSTEST_CONFIG can actually be a colon separate list of files, so take this
> into account when sanity checking it.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
diff mbox

Patch

diff --git a/standalone b/standalone
index c1139f8..caf3fd5 100755
--- a/standalone
+++ b/standalone
@@ -112,10 +112,19 @@  if [ ! -f standalone.db ] ; then
     exit 1
 fi
 
-if [ -z "$config" -o ! -r "$config" ] ; then
-    echo "Cannot read config." >&2
+if [ -z "$config" ] ; then
+    echo "No config specified." >&2
     exit 1
 fi
+IFS_saved=$IFS
+IFS=:
+for c in $config ; do
+    if [ -z "$c" -o ! -r "$c" ] ; then
+        echo "Cannot read config $c." >&2
+        exit 1
+    fi
+done
+IFS=$IFS_saved
 
 need_flight() {
     if [ -z "$flight" ] ; then