[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 for 3.0 04/18] docker: fail more gracefully on do
From: |
Alex Bennée |
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 |
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 v3 for 3.0 00/18] docker fixes (and one tcg test tweak), Alex Bennée, 2018/07/17
- [Qemu-devel] [PATCH v3 for 3.0 01/18] tests/.gitignore: don't ignore docker tests, Alex Bennée, 2018/07/17
- [Qemu-devel] [PATCH v3 for 3.0 05/18] docker: split configure_qemu from build_qemu, Alex Bennée, 2018/07/17
- [Qemu-devel] [PATCH v3 for 3.0 06/18] docker: move make check into check_qemu helper, Alex Bennée, 2018/07/17
- [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
- [Qemu-devel] [PATCH v3 for 3.0 02/18] docker: base debian-tricore on qemu:debian9, Alex Bennée, 2018/07/17
- [Qemu-devel] [PATCH v3 for 3.0 04/18] docker: fail more gracefully on docker.py check,
Alex Bennée <=
- [Qemu-devel] [PATCH v3 for 3.0 08/18] docker: Makefile.include don't include partial images, Alex Bennée, 2018/07/17
- [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
- [Qemu-devel] [PATCH v3 for 3.0 10/18] docker: add test-unit runner, Alex Bennée, 2018/07/17
- [Qemu-devel] [PATCH v3 for 3.0 07/18] docker: gracefully skip check_qemu, Alex Bennée, 2018/07/17
- [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
- [Qemu-devel] [PATCH v3 for 3.0 18/18] tests/tcg: remove runcom test, Alex Bennée, 2018/07/17
- [Qemu-devel] [PATCH v3 for 3.0 09/18] docker: disable debian-powerpc-user-cross, Alex Bennée, 2018/07/17
- [Qemu-devel] [PATCH v3 for 3.0 15/18] docker: add commentary to debian-bootstrap.docker, Alex Bennée, 2018/07/17