david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker: silence debootstrap when --quiet is given

Browse Source 
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 <silbe@linux.vnet.ibm.com>
Message-Id: <1473192351-601-9-git-send-email-silbe@linux.vnet.ibm.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Sascha Silbe 2016-09-06 22:05:51 +02:00 committed by Fam Zheng
parent ae2f659ca5
commit f8042deafa
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/docker/docker.py
View File

@ -239,8 +239,9 @@ class BuildCommand(SubCommand):
# Is there a .pre file to run in the build context? # Is there a .pre file to run in the build context?
docker_pre = os.path.splitext(args.dockerfile)[0]+".pre" docker_pre = os.path.splitext(args.dockerfile)[0]+".pre"
if os.path.exists(docker_pre): if os.path.exists(docker_pre):
stdout = DEVNULL if args.quiet else None
rc = subprocess.call(os.path.realpath(docker_pre), rc = subprocess.call(os.path.realpath(docker_pre),
cwd=docker_dir) cwd=docker_dir, stdout=stdout)
if rc == 3: if rc == 3:
print "Skip" print "Skip"
return 0 return 0