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

[fix] Keep only pending conf in conf regen

Browse source
This commit is contained in:
Jérôme Lebleu 2016-04-11 18:56:48 +02:00
parent eecf03ffbc
commit de04028309
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/yunohost/service.py
View file

@ -333,6 +333,7 @@ def service_regen_conf(names=[], with_diff=False, force=False):
if not system_hash: if not system_hash:
if to_remove: if to_remove:
logger.debug("> system conf is already removed") logger.debug("> system conf is already removed")
os.remove(pending_path)
continue continue
if not current_hash or force: if not current_hash or force:
if force: if force:
@ -376,6 +377,7 @@ def service_regen_conf(names=[], with_diff=False, force=False):
conf_status = 'updated' conf_status = 'updated'
else: else:
logger.debug("> system conf is already up-to-date") logger.debug("> system conf is already up-to-date")
os.remove(pending_path)
continue continue
else: else:
logger.debug("> system conf has been manually modified") logger.debug("> system conf has been manually modified")
@ -621,7 +623,7 @@ def _process_regen_conf(system_conf, new_conf=None, save=True):
system_dir = os.path.dirname(system_conf) system_dir = os.path.dirname(system_conf)
if not os.path.isdir(system_dir): if not os.path.isdir(system_dir):
filesystem.mkdir(system_dir, 0755, True) filesystem.mkdir(system_dir, 0755, True)
shutil.copy2(new_conf, system_conf) shutil.move(new_conf, system_conf)
logger.info(m18n.n('service_conf_file_updated', logger.info(m18n.n('service_conf_file_updated',
conf=system_conf)) conf=system_conf))
except: except: