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

Merge efaaed0b74 into 5c12ad36bf

Browse source
This commit is contained in:
julienmalik 2016-03-25 09:22:23 +00:00
commit bb8f1a24e8
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locales/en.json
View file

@ -126,7 +126,7 @@
"service_no_log" : "No log to display for service '{:s}'",
"service_cmd_exec_failed" : "Unable to execute command '{:s}'",
"services_configured": "Configuration successfully generated",
"service_configuration_conflict": "The file {file:s} has been changed since its last generation. Please apply the modifications manually or use the option --force (it will erase all the modifications previously done to the file).",
"service_configuration_conflict": "The file {file:s} has been changed since its last generation. Please apply the modifications manually or use 'sudo yunohost service regenconf --force --service {service:s}' (it will erase all the modifications previously done to the file).",
"no_such_conf_file": "Unable to copy the file {file:s}: the file does not exist",
"service_add_configuration": "Adding the configuration file {file:s}",
"show_diff": "Here are the differences:\n{diff:s}",

4
src/yunohost/service.py
View file

@ -472,7 +472,7 @@ def service_saferemove(service, conf_file, force=False):
os.remove(conf_backup_file)
if len(previous_hash) == 32 or previous_hash[-32:] != current_hash:
logger.warning(m18n.n('service_configuration_conflict',
file=conf_file))
file=conf_file, service=service))
_save_services(services)
@ -539,7 +539,7 @@ def service_safecopy(service, new_conf_file, conf_file, force=False):
new_hash = previous_hash
if (len(previous_hash) == 32 or previous_hash[-32:] != current_hash):
logger.warning('{0} {1}'.format(
m18n.n('service_configuration_conflict', file=conf_file),
m18n.n('service_configuration_conflict', file=conf_file, service=service),
m18n.n('show_diff', diff=''.join(diff))))
# Remove the backup file if the configuration has not changed