Skip to content

Commit 25ddb4e

Browse files
FFY00ambv
authored andcommitted
Revert "Resolve absolute path before attempting to calculate a relative path"
This reverts commit 95fc7f5. Signed-off-by: Filipe Laíns <lains@riseup.net>
1 parent b0c93a4 commit 25ddb4e

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

‎Lib/sysconfig/_build_details.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ def _relocate(self, obj: SchemaBase, origin: pathlib.Path) -> None:
235235
continue
236236
value = getattr(obj, field.name)
237237
if isinstance(value, pathlib.Path):
238-
changes[field.name] = value.absolute().relative_to(origin)
238+
changes[field.name] = value.relative_to(origin)
239239
elif isinstance(value, SchemaBase):
240240
changes[field.name] = self._relocate(value, origin)
241241
return dataclasses.replace(obj, **changes)
@@ -288,13 +288,11 @@ def from_interpreter(cls) -> BuildDetailsV1:
288288
LIBPC = pathlib.Path(sysconfig.get_config_var('LIBPC'))
289289
INCLUDEPY = pathlib.Path(sysconfig.get_config_var('INCLUDEPY'))
290290

291-
installed_base = pathlib.Path(sysconfig.get_config_var('installed_base'))
292-
293291
interpreter_name = 'python' + sysconfig.get_config_var('LDVERSION') + sysconfig.get_config_var('EXE')
294292

295293
data = types.SimpleNamespace()
296294

297-
data.base_prefix = installed_base.absolute()
295+
data.base_prefix = sysconfig.get_config_var('installed_base')
298296
data.base_interpreter = default_scheme_paths.scripts / interpreter_name
299297
data.platform = sysconfig.get_platform()
300298
data.language = LanguageV1(
@@ -405,7 +403,7 @@ def generate(path: _PathType, relative_paths=False) -> None:
405403
if relative_paths:
406404
data = data.as_relocatable()
407405
# If relative_paths is enabled, we also make base_prefix relative.
408-
data.base_prefix = data.base_prefix.relative_to(path.absolute())
406+
data.base_prefix = data.base_prefix.relative_to(path)
409407

410408
with open(path, 'w', encoding='utf-8') as f:
411409
f.write(data.as_json() + '\n')

0 commit comments

Comments
 (0)