Commit e8721f03 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1257516 - Use the logger for virtualenv manager output. r=ted

parent 0e183bb3

build/moz.configure/init.configure

+8 −5
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ def virtualenv_python(env_python, build_env, mozconfig): 
    import os

    import sys

    import subprocess

    from mozbuild.configure.util import LineIO

    from mozbuild.virtualenv import (

        VirtualenvManager,

        verify_python_version,
@@ -185,14 +186,16 @@ def virtualenv_python(env_python, build_env, mozconfig): 
        elif 'PYTHON' in mozconfig['vars']['modified']:

            python = mozconfig['vars']['modified']['PYTHON'][1]



    verify_python_version(sys.stderr)

    with LineIO(lambda l: log.error(l)) as out:

        verify_python_version(out)

    topsrcdir, topobjdir = build_env.topsrcdir, build_env.topobjdir

    if topobjdir.endswith('/js/src'):

        topobjdir = topobjdir[:-7]



    with LineIO(lambda l: log.info(l)) as out:

        manager = VirtualenvManager(

            topsrcdir, topobjdir,

        os.path.join(topobjdir, '_virtualenv'), sys.stdout,

            os.path.join(topobjdir, '_virtualenv'), out,

            os.path.join(topsrcdir, 'build', 'virtualenv_packages.txt'))



    if python: