From: Ian Campbell <ian.campbell@citrix.com>
To: ian.jackson@eu.citrix.com
Cc: Ian Campbell <ian.campbell@citrix.com>, xen-devel@lists.xen.org
Subject: [PATCH OSSTEST] standalone: Handle multiple configuration files.
Date: Wed, 5 Nov 2014 10:41:24 +0000 [thread overview]
Message-ID: <1415184084-14650-1-git-send-email-ian.campbell@citrix.com> (raw)
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(-)
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
--
2.1.1
next reply other threads:[~2014-11-05 10:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-05 10:41 Ian Campbell [this message]
2014-11-05 11:43 ` [PATCH OSSTEST] standalone: Handle multiple configuration files Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1415184084-14650-1-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).