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

Use REGEN_CONF_FILE global instead of hard-coded filename

Browse source
This commit is contained in:
Alexandre Aubin 2019-04-18 15:53:16 +02:00
parent 817c3cdd41
commit 8e7684c7d5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/yunohost/data_migrations/0009_decouple_regenconf_from_services.py
View file

@ -5,7 +5,7 @@ from moulinette.utils.log import getActionLogger
from moulinette.utils.filesystem import read_file from moulinette.utils.filesystem import read_file
from yunohost.service import _get_services, _save_services from yunohost.service import _get_services, _save_services
from yunohost.regenconf import _update_conf_hashes from yunohost.regenconf import _update_conf_hashes, REGEN_CONF_FILE
from yunohost.tools import Migration from yunohost.tools import Migration
@ -20,7 +20,7 @@ class MyMigration(Migration):
def migrate(self): def migrate(self):
if "conffiles" not in read_file("/etc/yunohost/services.yml") \ if "conffiles" not in read_file("/etc/yunohost/services.yml") \
or os.path.exists("/etc/yunohost/regenconf.yml"): or os.path.exists(REGEN_CONF_FILE):
logger.warning(m18n.n("migration_0009_not_needed")) logger.warning(m18n.n("migration_0009_not_needed"))
return return

2
src/yunohost/regenconf.py
View file

@ -67,7 +67,7 @@ def regen_conf(operation_logger, names=[], with_diff=False, force=False, dry_run
# in debian's postinst script # in debian's postinst script
if os.path.exists("/etc/yunohost/installed") \ if os.path.exists("/etc/yunohost/installed") \
and ("conffiles" in read_file("/etc/yunohost/services.yml") \ and ("conffiles" in read_file("/etc/yunohost/services.yml") \
or not os.path.exists("/etc/yunohost/regenconf.yml")): or not os.path.exists(REGEN_CONF_FILE)):
from yunohost.tools import _get_migration_by_name from yunohost.tools import _get_migration_by_name
migration = _get_migration_by_name("decouple_regenconf_from_services") migration = _get_migration_by_name("decouple_regenconf_from_services")
migration.migrate() migration.migrate()