From 17043a998f53ba8a61b44501512a41216e809151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Tue, 23 Apr 2024 23:46:02 +0200 Subject: [PATCH] setup: Look for releng in MESON_SOURCE_ROOT first For consistency with the ordering elsewhere. --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 523f0ca..73de061 100755 --- a/setup.py +++ b/setup.py @@ -33,16 +33,16 @@ def detect_version() -> str: def enumerate_releng_locations() -> Iterator[Path]: - local_releng = PACKAGE_DIR / "releng" - if releng_location_exists(local_releng): - yield local_releng - source_root = os.environ.get("MESON_SOURCE_ROOT") if source_root is not None: parent_releng = Path(source_root) / "releng" if releng_location_exists(parent_releng): yield parent_releng + local_releng = PACKAGE_DIR / "releng" + if releng_location_exists(local_releng): + yield local_releng + def releng_location_exists(location: Path) -> bool: return (location / "frida_version.py").exists()