2
0
mirror of https://github.com/frappe/bench.git synced 2024-11-12 08:16:28 +00:00

Merge branch 'develop' into dependency-resolution

This commit is contained in:
Aradhya Tripathi 2022-03-21 14:54:23 +05:30 committed by GitHub
commit dd97c430a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

View File

@ -141,9 +141,9 @@ class Bench(Base, Validator):
if conf.get("developer_mode"): if conf.get("developer_mode"):
restart_process_manager(bench_path=self.name, web_workers=web) 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) 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) restart_systemd_processes(bench_path=self.name, web_workers=web)
def get_installed_apps(self) -> List: def get_installed_apps(self) -> List:

View File

@ -174,8 +174,7 @@ def migrate_env(python, backup=False):
from datetime import datetime from datetime import datetime
parch = os.path.join(path, "archived", "envs") parch = os.path.join(path, "archived", "envs")
if not os.path.exists(parch): os.makedirs(parch, exist_ok=True)
os.mkdir(parch)
source = os.path.join(path, "env") source = os.path.join(path, "env")
target = parch target = parch