From e857f4f0b27d71299c498305b24e4b3f7e4571c4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 19 Dec 2016 12:17:27 -0500 Subject: [PATCH] [mod] Cleaner logs for _get_conf_hashes --- src/yunohost/service.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/yunohost/service.py b/src/yunohost/service.py index dcd3dee83..2d9068180 100644 --- a/src/yunohost/service.py +++ b/src/yunohost/service.py @@ -639,12 +639,17 @@ def _get_pending_conf(services=[]): def _get_conf_hashes(service): """Get the registered conf hashes for a service""" - try: - return _get_services()[service]['conffiles'] - except: - logger.debug("unable to retrieve conf hashes for %s", - service, exc_info=1) + + d = _get_services() + + if (service not in d.keys()): + logger.debug("Service %s is not in services.yml yet.", service) return {} + elif ('conffiles' not in d[service].keys()): + logger.debug("No configuration files for service %s.", service) + return {} + else: + return d[service]['conffiles'] def _update_conf_hashes(service, hashes):