From 25f49c2dbba998a7b11975a6f17034bdb050c3ab Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 17 Mar 2022 10:01:57 +0530 Subject: [PATCH 1/2] fix: Respect bench config during restart Fixes https://github.com/frappe/bench/issues/1261 --- bench/bench.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bench/bench.py b/bench/bench.py index f359be7c..655693e2 100644 --- a/bench/bench.py +++ b/bench/bench.py @@ -138,9 +138,9 @@ class Bench(Base, Validator): if conf.get("developer_mode"): restart_process_manager(bench_path=self.name, web_workers=web) - if supervisor and conf.get("restart_supervisor_on_update"): + if supervisor or conf.get("restart_supervisor_on_update"): restart_supervisor_processes(bench_path=self.name, web_workers=web) - if systemd and conf.get("restart_systemd_on_update"): + if systemd or conf.get("restart_systemd_on_update"): restart_systemd_processes(bench_path=self.name, web_workers=web) def get_installed_apps(self) -> List: From d38b63a483deb0186828e82e09c4c650eb672d54 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 17 Mar 2022 09:38:02 +0530 Subject: [PATCH 2/2] fix: mkdir -p to ignore `OSError`s Closes https://github.com/frappe/bench/issues/1279 --- bench/utils/bench.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bench/utils/bench.py b/bench/utils/bench.py index 82a63bef..9f170ba1 100644 --- a/bench/utils/bench.py +++ b/bench/utils/bench.py @@ -174,8 +174,7 @@ def migrate_env(python, backup=False): from datetime import datetime parch = os.path.join(path, "archived", "envs") - if not os.path.exists(parch): - os.mkdir(parch) + os.makedirs(parch, exist_ok=True) source = os.path.join(path, "env") target = parch