diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-10-26 19:41:42 +0200 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2021-10-26 15:16:11 -0400 |
commit | 0fea9965ada82845c1e8a908078c573a68a2029a (patch) | |
tree | ccd564eac07bd4bb175df81549b285ff4a6eb5df /mesonbuild | |
parent | 89e9b502929accf8690a2fcc722e8e37fd90a772 (diff) | |
download | meson-0fea9965ada82845c1e8a908078c573a68a2029a.zip meson-0fea9965ada82845c1e8a908078c573a68a2029a.tar.gz meson-0fea9965ada82845c1e8a908078c573a68a2029a.tar.bz2 |
interpreter: Revert old path joining behavior (fixes #9450)
Diffstat (limited to 'mesonbuild')
-rw-r--r-- | mesonbuild/interpreter/primitives/string.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/interpreter/primitives/string.py b/mesonbuild/interpreter/primitives/string.py index 5b29501..3f8df5e 100644 --- a/mesonbuild/interpreter/primitives/string.py +++ b/mesonbuild/interpreter/primitives/string.py @@ -2,6 +2,7 @@ # SPDX-license-identifier: Apache-2.0 import re +import os from pathlib import PurePath import typing as T @@ -159,7 +160,7 @@ class StringHolder(ObjectHolder[str]): @FeatureNew('/ with string arguments', '0.49.0') @typed_operator(MesonOperator.DIV, str) def op_div(self, other: str) -> str: - return (PurePath(self.held_object) / other).as_posix() + return os.path.join(self.held_object, other).replace('\\', '/') @typed_operator(MesonOperator.INDEX, int) def op_index(self, other: int) -> str: |