From 02ff06f43af682bb2e7bb929e57c65520e99ca77 Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Thu, 12 Dec 2013 10:59:34 -0500 Subject: [PATCH] [ALL] Fix for Gearman SSL file check Although options may not be defined in the config file, the keys are still present in the CONF structure, but with None values. We need to take that into consideration. Change-Id: Id1915a55db3ae4f70895c9f94876e318743dcd19 --- libra/common/options.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libra/common/options.py b/libra/common/options.py index abba4330..244d04a5 100644 --- a/libra/common/options.py +++ b/libra/common/options.py @@ -82,6 +82,8 @@ def check_gearman_ssl_files(): for key in ['ssl_ca', 'ssl_cert', 'ssl_key']: if key in CONF['gearman']: fname = CONF['gearman'][key] + if fname is None: + continue if not os.path.exists(fname): raise Exception("Gearman SSL file %s does not exist" % fname) if not os.access(fname, os.R_OK):