YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Uhoh we can't call domain_list if postinstall ain't done yet

Browse source
This commit is contained in:
Alexandre Aubin 2020-04-25 05:24:27 +02:00
parent b90155423d
commit 9ef2c60a90
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/yunohost/regenconf.py
View file

@ -146,7 +146,12 @@ def regen_conf(operation_logger, names=[], with_diff=False, force=False, dry_run
# ends up in wasted time (about 3~5 seconds per call on a RPi2) # ends up in wasted time (about 3~5 seconds per call on a RPi2)
from yunohost.domain import domain_list from yunohost.domain import domain_list
env = {} env = {}
env["YNH_DOMAINS"] = " ".join(domain_list()["domains"]) # Well we can only do domain_list() if postinstall is done ...
# ... but hooks that effectively need the domain list are only
# called only after the 'installed' flag is set so that's all good,
# though kinda tight-coupled to the postinstall logic :s
if os.path.exists("/etc/yunohost/installed"):
env["YNH_DOMAINS"] = " ".join(domain_list()["domains"])
pre_result = hook_callback('conf_regen', names, pre_callback=_pre_call, env=env) pre_result = hook_callback('conf_regen', names, pre_callback=_pre_call, env=env)