[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 7/7] docker: silence debootstrap when --quiet is
From: |
Sascha Silbe |
Subject: |
[Qemu-devel] [PATCH v2 7/7] docker: silence debootstrap when --quiet is given |
Date: |
Wed, 24 Aug 2016 20:31:03 +0200 |
If we silence docker when --quiet is given, we should also silence the
.pre script (i.e. debootstrap).
Only discards stdout, so some diagnostics (e.g. from git clone) are
still printed. Most of the verbose output is gone however and this way
we still have a chance to see error messages.
Signed-off-by: Sascha Silbe <address@hidden>
---
tests/docker/docker.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index efb2bf4..b85c165 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -239,8 +239,9 @@ class BuildCommand(SubCommand):
# Is there a .pre file to run in the build context?
docker_pre = os.path.splitext(args.dockerfile)[0]+".pre"
if os.path.exists(docker_pre):
+ stdout = DEVNULL if args.quiet else None
rc = subprocess.call(os.path.realpath(docker_pre),
- cwd=docker_dir)
+ cwd=docker_dir, stdout=stdout)
if rc == 3:
print "Skip"
return 0
--
1.9.1
- [Qemu-devel] [PATCH v2 0/7] docker tests fixes, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 3/7] docker: debian-bootstrap.pre: print helpful message if DEB_ARCH/DEB_TYPE unset, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 4/7] docker: print warning if EXECUTABLE is not set when building debootstrap image, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 5/7] docker: make sure debootstrap is at least 1.0.67, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 7/7] docker: silence debootstrap when --quiet is given,
Sascha Silbe <=
- [Qemu-devel] [PATCH v2 1/7] docker.py: don't hang on large docker output, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 2/7] docker: avoid dependency on 'realpath' package, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 6/7] docker: build debootstrap after cloning, Sascha Silbe, 2016/08/24