From 9881856472f7fd39f12d69d3790a98d05df13544 Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 23 Nov 2024 15:17:37 +0100 Subject: [PATCH] Revert "cbuild: temporarily add --root to apk version calls" This reverts commit d6b02e25dcd4e317101e6cf83e29b413aeff6735. --- src/cbuild/apk/cli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cbuild/apk/cli.py b/src/cbuild/apk/cli.py index 8f7fb296fe..36d0a72309 100644 --- a/src/cbuild/apk/cli.py +++ b/src/cbuild/apk/cli.py @@ -263,7 +263,7 @@ def check_version(*args): if len(args) == 1 and not args[0][0].isdigit(): return False v = subprocess.run( - [paths.apk(), "--root", paths.bldroot(), "version", "--quiet", "--check", *args], + [paths.apk(), "version", "--quiet", "--check", *args], capture_output=True, ) return v.returncode == 0 @@ -276,7 +276,7 @@ def compare_version(v1, v2, strict=True): raise RuntimeError("invalid version") v = subprocess.run( - [paths.apk(), "--root", paths.bldroot(), "version", "--quiet", "--test", v1, v2], + [paths.apk(), "version", "--quiet", "--test", v1, v2], capture_output=True, check=True, ).stdout.strip()