[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for 3.0 03/10] docker: fail more gracefully on docke
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH for 3.0 03/10] docker: fail more gracefully on docker.py check |
Date: |
Mon, 9 Jul 2018 16:21:10 +0100 |
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 <address@hidden>
Reported-by: Peter Maydell <address@hidden>
---
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
- [Qemu-devel] [PATCH for 3.0 02/10] docker: debian-tricore add git tools, (continued)
- [Qemu-devel] [PATCH for 3.0 03/10] docker: fail more gracefully on docker.py check,
Alex Bennée <=
- [Qemu-devel] [PATCH for 3.0 04/10] docker: split configure_qemu from build_qemu, Alex Bennée, 2018/07/09
- [Qemu-devel] [PATCH for 3.0 07/10] docker: Makefile.include don't include partial images, Alex Bennée, 2018/07/09
- [Qemu-devel] [PATCH for 3.0 06/10] docker: gracefully skip check_qemu, Alex Bennée, 2018/07/09
- [Qemu-devel] [PATCH for 3.0 08/10] docker: disable debian-powerpc-user-cross, Alex Bennée, 2018/07/09
- [Qemu-devel] [PATCH for 3.0 10/10] docker: add expansion for docker-test-FOO to Makefile.include, Alex Bennée, 2018/07/09