Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

scripts: Use pathlib to join destdir #10180

Closed
wants to merge 1 commit into from
Closed

scripts: Use pathlib to join destdir #10180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions mesonbuild/scripts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2016 The Meson development team
# Copyright 2016-2022 The Meson development team

# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -12,10 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# TODO: consider switching to pathlib for this
from pathlib import Path
import os

def destdir_join(d1: str, d2: str) -> str:
# c:\destdir + c:\prefix must produce c:\destdir\prefix
if len(d1) > 1 and d1[1] == ':' \
and len(d2) > 1 and d2[1] == ':':
return d1 + d2[2:]
return d1 + d2
p = pathlib.Path(d2)
if d1 and p.is_absolute():
p = p.relative_to(p.anchor)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If memory serves, relative_to throws an exception if the two paths are on different drives (e.g. c: and d:).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is relative to its own anchor; it is not mixing paths, and cannot possibly trigger that.

return os.path.join(d1, p)