From: "Alex Bennée" <alex.bennee@linaro.org>
To: cota@braap.org, famz@redhat.com, berrange@redhat.com,
f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com,
aurelien@aurel32.net, agraf@suse.de
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH v3 for 3.0 04/18] docker: fail more gracefully on docker.py check
Date: Tue, 17 Jul 2018 20:55:39 +0100 [thread overview]
Message-ID: <20180717195553.9111-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org>
As this is called directly from the Makefile while determining
dependencies and it is possible the user was configured in one window
but not have credentials in the other. Let's catch the Exceptions and
deal with it quietly.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
tests/docker/docker.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 69e7130db7..2f81c6b13b 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -479,7 +479,12 @@ class CheckCommand(SubCommand):
def run(self, args, argv):
tag = args.tag
- dkr = Docker()
+ try:
+ dkr = Docker()
+ except:
+ print("Docker not set up")
+ return 1
+
info = dkr.inspect_tag(tag)
if info is None:
print("Image does not exist")
--
2.17.1
next prev parent reply other threads:[~2018-07-17 19:56 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-17 19:55 [Qemu-devel] [PATCH v3 for 3.0 00/18] docker fixes (and one tcg test tweak) Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 01/18] tests/.gitignore: don't ignore docker tests Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 02/18] docker: base debian-tricore on qemu:debian9 Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 03/18] docker: par down QEMU_CONFIGURE_OPTS in debian-tricore-cross Alex Bennée
2018-07-17 19:55 ` Alex Bennée [this message]
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 05/18] docker: split configure_qemu from build_qemu Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 06/18] docker: move make check into check_qemu helper Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 07/18] docker: gracefully skip check_qemu Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 08/18] docker: Makefile.include don't include partial images Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 09/18] docker: disable debian-powerpc-user-cross Alex Bennée
2018-07-23 15:09 ` Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 10/18] docker: add test-unit runner Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 11/18] docker: add expansion for docker-test-FOO to Makefile.include Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 12/18] docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 13/18] docker: add --hint to docker.py check Alex Bennée
2018-07-24 7:46 ` Fam Zheng
2018-07-24 8:52 ` Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 14/18] docker: Update debootstrap script after Debian migration from Alioth to Salsa Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 15/18] docker: add commentary to debian-bootstrap.docker Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 16/18] docker: ignore distro versioning of debootstrap Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 17/18] docker: perform basic binfmt_misc validation in docker.py Alex Bennée
2018-07-24 7:50 ` Fam Zheng
2018-07-24 8:55 ` Alex Bennée
2018-07-17 19:55 ` [Qemu-devel] [PATCH v3 for 3.0 18/18] tests/tcg: remove runcom test Alex Bennée
2018-07-24 9:53 ` Peter Maydell
2018-07-23 10:03 ` [Qemu-devel] [PATCH v3 for 3.0 00/18] docker fixes (and one tcg test tweak) Alex Bennée
2018-07-24 7:57 ` Fam Zheng
2018-07-24 8:56 ` Alex Bennée
2018-07-24 9:09 ` Fam Zheng
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=20180717195553.9111-5-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=agraf@suse.de \
--cc=aurelien@aurel32.net \
--cc=balrogg@gmail.com \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).