[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 for 3.0 04/16] docker: fail more gracefully on do
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v2 for 3.0 04/16] docker: fail more gracefully on docker.py check |
Date: |
Fri, 13 Jul 2018 13:17:29 +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>
Reviewed-by: Philippe Mathieu-Daudé <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 v2 for 3.0 00/16] various docker fixes, Alex Bennée, 2018/07/13
- [Qemu-devel] [PATCH v2 for 3.0 04/16] docker: fail more gracefully on docker.py check,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 for 3.0 05/16] docker: split configure_qemu from build_qemu, Alex Bennée, 2018/07/13
- [Qemu-devel] [PATCH v2 for 3.0 09/16] docker: disable debian-powerpc-user-cross, Alex Bennée, 2018/07/13
- [Qemu-devel] [PATCH v2 for 3.0 13/16] docker: add --hint to docker.py check, Alex Bennée, 2018/07/13
- [Qemu-devel] [PATCH v2 for 3.0 07/16] docker: gracefully skip check_qemu, Alex Bennée, 2018/07/13