[fix] Do not restrict warning to tty in service_saferemove

This commit is contained in:
Jérôme Lebleu 2015-11-14 23:40:16 +01:00
parent b7fcf9ffdb
commit 40145648f0

View file

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