From 683a421e43d04a4ef6ea11f95f2ce562bbafcfca Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Thu, 18 Jan 2024 16:23:04 +0530 Subject: [PATCH] refactor: use env to trigger using-cached flag Click supports pulling args from an envvar if it is present, this would be quicker and cleaner than calling a dummy command to check if the feature is supported --- bench/utils/bench.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/bench/utils/bench.py b/bench/utils/bench.py index 7e0b111fb..306fa6238 100644 --- a/bench/utils/bench.py +++ b/bench/utils/bench.py @@ -354,17 +354,11 @@ def build_assets(bench_path=".", app=None, using_cached=False): if app: command += f" --app {app}" - if using_cached and can_use_cached(bench_path): - command += " --using-cached" + env = {"BENCH_DEVELOPER": "1"} + if using_cached: + env["USING_CACHED"] = "1" - exec_cmd(command, cwd=bench_path, env={"BENCH_DEVELOPER": "1"}) - -def can_use_cached(bench_path=".") -> bool: - cmd = ["bench", "can-use-cached"] - return_code = subprocess.call( - cmd, cwd=bench_path, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, - ) - return not return_code + exec_cmd(command, cwd=bench_path, env=env) def handle_version_upgrade(version_upgrade, bench_path, force, reset, conf): from bench.utils import log, pause_exec