Commit f8042dea authored by Sascha Silbe's avatar Sascha Silbe Committed by Fam Zheng
Browse files

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: default avatarSascha Silbe <silbe@linux.vnet.ibm.com>
Message-Id: <1473192351-601-9-git-send-email-silbe@linux.vnet.ibm.com>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent ae2f659c

tests/docker/docker.py

+2 −1
Original line number Diff line number Diff line
@@ -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