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] Ensure that pending conf file is deleted after it's applied

Browse source
This commit is contained in:
Jérôme Lebleu 2016-04-19 20:24:49 +02:00
parent c81393425a
commit 26adf05042
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/yunohost/service.py
View file

@ -373,7 +373,6 @@ def service_regen_conf(names=[], with_diff=False, force=False,
logger.debug("> system conf is not managed yet")
if system_hash == new_hash:
logger.debug("> no changes to system conf has been made")
os.remove(pending_path)
conf_status = 'managed'
regenerated = True
elif force and to_remove:
@ -416,6 +415,8 @@ def service_regen_conf(names=[], with_diff=False, force=False,
if regenerated:
succeed_regen[system_path] = conf_result
conf_hashes[system_path] = new_hash
if os.path.isfile(pending_path):
os.remove(pending_path)
else:
failed_regen[system_path] = conf_result
@ -650,7 +651,7 @@ def _process_regen_conf(system_conf, new_conf=None, save=True):
system_dir = os.path.dirname(system_conf)
if not os.path.isdir(system_dir):
filesystem.mkdir(system_dir, 0755, True)
shutil.move(new_conf, system_conf)
shutil.copy2(new_conf, system_conf)
logger.info(m18n.n('service_conf_file_updated',
conf=system_conf))
except: