From 6b5a5bd180383782445f58f40511dfd03ef8b5ea Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Wed, 3 Mar 2021 15:17:04 +0100 Subject: [PATCH] remove build arg from manager prepare_managed_process (#20229) --- selfdrive/manager.py | 13 +------------ selfdrive/test/process_replay/process_replay.py | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/selfdrive/manager.py b/selfdrive/manager.py index 63b6fddeb8..e1aa725637 100755 --- a/selfdrive/manager.py +++ b/selfdrive/manager.py @@ -311,23 +311,12 @@ def start_daemon_process(name): params.put(pid_param, str(proc.pid)) -def prepare_managed_process(p, build=False): +def prepare_managed_process(p): proc = managed_processes[p] if isinstance(proc, str): # import this python cloudlog.info("preimporting %s" % proc) importlib.import_module(proc) - elif os.path.isfile(os.path.join(BASEDIR, proc[0], "SConscript")) and build: - # build this process - cloudlog.info("building %s" % (proc,)) - try: - subprocess.check_call(["scons", "u", "-j4", "."], cwd=os.path.join(BASEDIR, proc[0])) - except subprocess.CalledProcessError: - # clean and retry if the build failed - cloudlog.warning("building %s failed, cleaning and retrying" % (proc, )) - subprocess.check_call(["scons", "-u", "-c", "."], cwd=os.path.join(BASEDIR, proc[0])) - subprocess.check_call(["scons", "-u", "-j4", "."], cwd=os.path.join(BASEDIR, proc[0])) - def join_process(process, timeout): # Process().join(timeout) will hang due to a python 3 bug: https://bugs.python.org/issue28382 diff --git a/selfdrive/test/process_replay/process_replay.py b/selfdrive/test/process_replay/process_replay.py index c100137d51..64bee5a6a0 100755 --- a/selfdrive/test/process_replay/process_replay.py +++ b/selfdrive/test/process_replay/process_replay.py @@ -348,7 +348,7 @@ def python_replay_process(cfg, lr): os.environ['FINGERPRINT'] = msg.carParams.carFingerprint break - manager.prepare_managed_process(cfg.proc_name, build=True) + manager.prepare_managed_process(cfg.proc_name) mod = importlib.import_module(manager.managed_processes[cfg.proc_name]) thread = threading.Thread(target=mod.main, args=args) thread.daemon = True