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] Do not restrict warning to tty in service_saferemove

Browse source
This commit is contained in:
Jérôme Lebleu 2015-11-14 23:40:16 +01:00
parent b7fcf9ffdb
commit 40145648f0
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/yunohost/service.py
View file

@ -469,8 +469,7 @@ def service_saferemove(service, conf_file, force=False):
else: else:
services[service]['conffiles'][conf_file] = previous_hash services[service]['conffiles'][conf_file] = previous_hash
os.remove(conf_backup_file) os.remove(conf_backup_file)
if os.isatty(1) and \ if len(previous_hash) == 32 or previous_hash[-32:] != current_hash:
(len(previous_hash) == 32 or previous_hash[-32:] != current_hash):
logger.warning(m18n.n('service_configuration_conflict', logger.warning(m18n.n('service_configuration_conflict',
file=conf_file)) file=conf_file))