[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 9/9] docker: silence debootstrap when --quiet is give
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 9/9] docker: silence debootstrap when --quiet is given |
Date: |
Fri, 9 Sep 2016 13:52:23 +0800 |
From: Sascha Silbe <address@hidden>
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>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <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
--
2.7.4
- [Qemu-devel] [PULL 0/9] Docker patches, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 1/9] docker: Add a glib2-2.22 image, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 2/9] docker.py: don't hang on large docker output, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 3/9] docker: avoid dependency on 'realpath' package, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 4/9] docker: debian-bootstrap.pre: print error messages to stderr, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 5/9] docker: debian-bootstrap.pre: print helpful message if DEB_ARCH/DEB_TYPE unset, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 6/9] docker: print warning if EXECUTABLE is not set when building debootstrap image, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 7/9] docker: make sure debootstrap is at least 1.0.67, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 9/9] docker: silence debootstrap when --quiet is given,
Fam Zheng <=
- [Qemu-devel] [PULL 8/9] docker: build debootstrap after cloning, Fam Zheng, 2016/09/09
- Re: [Qemu-devel] [PULL 0/9] Docker patches, Peter Maydell, 2016/09/09