mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 10:44:56 +00:00
Bug 1324473 - mozboot: Normalize windows path advice. r=gps
On windows, python generally returns windows-style paths, with drive letters and backslash for a separator. However, when we offer advice for updating the PATH variable, we're talking about the msys environment which uses unix-style paths. Convert to avoid confusion. This is intended to turn c:\Users\mozilla\ into /c/Users/mozilla/. MozReview-Commit-ID: FdB8FvjeCV1 --HG-- extra : rebase_source : 6d9e87b460417254bbe2eb5af3813e22f2126fb1
This commit is contained in:
parent
6f69bab955
commit
afb3ed504c
@ -537,6 +537,16 @@ class BaseBootstrapper(object):
|
|||||||
cargo_bin = os.path.join(cargo_home, 'bin')
|
cargo_bin = os.path.join(cargo_home, 'bin')
|
||||||
return cargo_home, cargo_bin
|
return cargo_home, cargo_bin
|
||||||
|
|
||||||
|
def win_to_msys_path(self, path):
|
||||||
|
'''Convert a windows-style path to msys style.'''
|
||||||
|
drive, path = os.path.splitdrive(path)
|
||||||
|
path = '/'.join(path.split('\\'))
|
||||||
|
if drive:
|
||||||
|
if path[0] == '/':
|
||||||
|
path = path[1:]
|
||||||
|
path = '/%s/%s' % (drive[:-1], path)
|
||||||
|
return path
|
||||||
|
|
||||||
def print_rust_path_advice(self, template, cargo_home, cargo_bin):
|
def print_rust_path_advice(self, template, cargo_home, cargo_bin):
|
||||||
# Suggest ~/.cargo/env if it exists.
|
# Suggest ~/.cargo/env if it exists.
|
||||||
if os.path.exists(os.path.join(cargo_home, 'env')):
|
if os.path.exists(os.path.join(cargo_home, 'env')):
|
||||||
@ -546,7 +556,7 @@ class BaseBootstrapper(object):
|
|||||||
# so fall back to a manual PATH update. Bootstrap
|
# so fall back to a manual PATH update. Bootstrap
|
||||||
# only runs under msys, so a unix-style shell command
|
# only runs under msys, so a unix-style shell command
|
||||||
# is appropriate there.
|
# is appropriate there.
|
||||||
cmd = 'export PATH=%s:$PATH' % cargo_bin
|
cmd = 'export PATH=%s:$PATH' % self.win_to_msys_path(cargo_bin)
|
||||||
print(template % {
|
print(template % {
|
||||||
'cargo_bin': cargo_bin,
|
'cargo_bin': cargo_bin,
|
||||||
'cmd': cmd,
|
'cmd': cmd,
|
||||||
|
Loading…
Reference in New Issue
Block a user