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 pull request #252 from ZeHiro/fix-785

Browse source 
[fix] handle the case where services[service] is set to null in the s…
This commit is contained in:
Laurent Peuch 2017-02-19 20:17:12 +01:00 • committed by GitHub
commit 45e85fef82
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/yunohost/service.py
View file

@ -645,7 +645,7 @@ def _get_conf_hashes(service):
if service not in services: if service not in services:
logger.debug("Service %s is not in services.yml yet.", service) logger.debug("Service %s is not in services.yml yet.", service)
return {} return {}
elif 'conffiles' not in services[service]: elif services[service] is None or 'conffiles' not in services[service]:
logger.debug("No configuration files for service %s.", service) logger.debug("No configuration files for service %s.", service)
return {} return {}
else: else:
@ -658,6 +658,11 @@ def _update_conf_hashes(service, hashes):
service, hashes) service, hashes)
services = _get_services() services = _get_services()
service_conf = services.get(service, {}) service_conf = services.get(service, {})
# Handle the case where services[service] is set to null in the yaml
if service_conf is None:
service_conf = {}
service_conf['conffiles'] = hashes service_conf['conffiles'] = hashes
services[service] = service_conf services[service] = service_conf
_save_services(services) _save_services(services)