/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tools/win32/bootstrap.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:28:14 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20190529032814-fzqbrgf9647u9ptq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/win32/bootstrap.py
48
48
 
49
49
cmd = 'from setuptools.command.easy_install import main; main()'
50
50
ws = pkg_resources.working_set
 
51
env = dict(
 
52
    os.environ,
 
53
    PYTHONPATH=ws.find(pkg_resources.Requirement.parse('setuptools')).location)
51
54
 
52
55
if is_jython:
53
56
    import subprocess
54
57
 
55
 
    env = dict(
56
 
        os.environ,
57
 
        PYTHONPATH=ws.find(
58
 
            pkg_resources.Requirement.parse('setuptools')).location
59
 
        )
60
 
 
61
58
    assert subprocess.Popen(
62
59
        [sys.executable] +
63
60
        ['-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout'],
66
63
else:
67
64
    assert os.spawnle(
68
65
        os.P_WAIT, sys.executable, quote(sys.executable),
69
 
        '-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout',
70
 
        dict(
71
 
            os.environ,
72
 
            PYTHONPATH=
73
 
            ws.find(pkg_resources.Requirement.parse('setuptools')).location
74
 
            ),
 
66
        '-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout', env,
75
67
        ) == 0
76
68
 
77
69
ws.add_entry(tmpeggs)