Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 07:38:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

win32: force PATH to be non-unicode on win32, if virtualenv munges it

Browse source
This commit is contained in:
Vladimir Vukicevic 2015-10-06 12:09:50 -04:00 • committed by Lars Bergstrom
parent ee863fde59
commit 5b845cbf79
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python/servo/command_base.py
View file

@ -224,6 +224,14 @@ class CommandBase(object):
def build_env(self, gonk=False, hosts_file_path=None): def build_env(self, gonk=False, hosts_file_path=None):
"""Return an extended environment dictionary.""" """Return an extended environment dictionary."""
env = os.environ.copy() env = os.environ.copy()
if sys.platform == "win32" and type(env['PATH']) == unicode:
# On win32, the virtualenv's activate_this.py script sometimes ends up
# turning os.environ['PATH'] into a unicode string. This doesn't work
# for passing env vars in to a process, so we force it back to ascii.
# We don't use UTF8 since that won't be correct anyway; if you actually
# have unicode stuff in your path, all this PATH munging would have broken
# it in any case.
env['PATH'] = env['PATH'].encode('ascii', 'ignore')
extra_path = [] extra_path = []
extra_lib = [] extra_lib = []
if not self.config["tools"]["system-rust"] \ if not self.config["tools"]["system-rust"] \