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] Handle when new conf is as current system conf in regen-conf

Browse source
This commit is contained in:
Jérôme Lebleu 2016-05-01 12:49:48 +02:00
parent 2ebd926785
commit fcfb6de16e
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/yunohost/service.py
View file

@ -351,8 +351,8 @@ def service_regen_conf(names=[], with_diff=False, force=False, dry_run=False,
to_remove = True if os.path.getsize(pending_path) == 0 else False to_remove = True if os.path.getsize(pending_path) == 0 else False
# Retrieve and calculate hashes # Retrieve and calculate hashes
current_hash = conf_hashes.get(system_path, None)
system_hash = _calculate_hash(system_path) system_hash = _calculate_hash(system_path)
saved_hash = conf_hashes.get(system_path, None)
new_hash = None if to_remove else _calculate_hash(pending_path) new_hash = None if to_remove else _calculate_hash(pending_path)
# -> system conf does not exists # -> system conf does not exists
@ -361,7 +361,7 @@ def service_regen_conf(names=[], with_diff=False, force=False, dry_run=False,
logger.debug("> system conf is already removed") logger.debug("> system conf is already removed")
os.remove(pending_path) os.remove(pending_path)
continue continue
if not current_hash or force: if not saved_hash or force:
if force: if force:
logger.debug("> system conf has been manually removed") logger.debug("> system conf has been manually removed")
conf_status = 'force-created' conf_status = 'force-created'
@ -376,7 +376,7 @@ def service_regen_conf(names=[], with_diff=False, force=False, dry_run=False,
conf=system_path)) conf=system_path))
conf_status = 'removed' conf_status = 'removed'
# -> system conf is not managed yet # -> system conf is not managed yet
elif not current_hash: elif not saved_hash:
logger.debug("> system conf is not managed yet") logger.debug("> system conf is not managed yet")
if system_hash == new_hash: if system_hash == new_hash:
logger.debug("> no changes to system conf has been made") logger.debug("> no changes to system conf has been made")
@ -393,7 +393,7 @@ def service_regen_conf(names=[], with_diff=False, force=False, dry_run=False,
conf=system_path)) conf=system_path))
conf_status = 'unmanaged' conf_status = 'unmanaged'
# -> system conf has not been manually modified # -> system conf has not been manually modified
elif system_hash == current_hash: elif system_hash == saved_hash:
if to_remove: if to_remove:
regenerated = _regen(system_path) regenerated = _regen(system_path)
conf_status = 'removed' conf_status = 'removed'
@ -406,7 +406,11 @@ def service_regen_conf(names=[], with_diff=False, force=False, dry_run=False,
continue continue
else: else:
logger.debug("> system conf has been manually modified") logger.debug("> system conf has been manually modified")
if force: if system_hash == new_hash:
logger.debug("> new conf is as current system conf")
conf_status = 'managed'
regenerated = True
elif force:
regenerated = _regen(system_path, pending_path) regenerated = _regen(system_path, pending_path)
conf_status = 'force-updated' conf_status = 'force-updated'
else: else: