docker: silence debootstrap when --quiet is given

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 <[email protected]> Message-Id: <[email protected]> Signed-off-by: Fam Zheng <[email protected]>
rrshah · Sep 8, 2016 · f8042de · f8042de
1 parent ae2f659
commit f8042de
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
@@ -239,8 +239,9 @@ def run(self, args, argv):
             # 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