From 93b532f0bfb2c5a01f7eac3b406f3dcc33def2b6 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 12 Aug 2013 16:18:42 -0500 Subject: [PATCH] Don't hit an AttributeError if ctx.config['overrides'] is set to None --- teuthology/task/install.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/teuthology/task/install.py b/teuthology/task/install.py index 87e105deb9a2c..b90a67e3559d7 100644 --- a/teuthology/task/install.py +++ b/teuthology/task/install.py @@ -851,8 +851,10 @@ def task(ctx, config): project, = config.get('project', 'ceph'), log.debug('project %s' % project) - overrides = ctx.config.get('overrides', {}).get('install', {}) - teuthology.deep_merge(config, overrides.get(project, {})) + overrides = ctx.config.get('overrides', {}) + if overrides: + install_overrides = overrides.get('install', {}) + teuthology.deep_merge(config, install_overrides.get(project, {})) log.debug('config %s' % config) # Flavor tells us what gitbuilder to fetch the prebuilt software -- 2.39.5