Skip to content

Commit

Permalink
Auto merge of #27003 - saschanaz:py3-msvc-deps, r=jdm
Browse files Browse the repository at this point in the history
Fix Py3 failures when installing MSVC dependencies

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
  • Loading branch information
bors-servo committed Jun 20, 2020
2 parents 6b321f6 + 74e0d02 commit 292704b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion python/servo/bootstrap.py
Expand Up @@ -271,7 +271,8 @@ def check_cmake(version):
cmake_path = find_executable("cmake")
if cmake_path:
cmake = subprocess.Popen([cmake_path, "--version"], stdout=PIPE)
cmake_version = cmake.stdout.read().splitlines()[0].replace("cmake version ", "")
cmake_version_output = six.ensure_str(cmake.stdout.read()).splitlines()[0]
cmake_version = cmake_version_output.replace("cmake version ", "")
if LooseVersion(cmake_version) >= LooseVersion(version):
return True
return False
Expand Down
2 changes: 1 addition & 1 deletion python/servo/command_base.py
Expand Up @@ -216,7 +216,7 @@ def is_linux():
def append_to_path_env(string, env, name):
variable = ""
if name in env:
variable = env[name]
variable = six.ensure_str(env[name])
if len(variable) > 0:
variable += os.pathsep
variable += string
Expand Down

0 comments on commit 292704b

Please sign in to comment.