From: Zack Cerza <zack@cerza.org>
Date: Wed, 28 Aug 2013 16:19:04 +0000 (-0500)
Subject: Don't return inside __init__
X-Git-Tag: 1.1.0~1926^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F54%2Fhead;p=teuthology.git

Don't return inside __init__
---

diff --git a/teuthology/config.py b/teuthology/config.py
index 45b0b92ad..24e466f5b 100644
--- a/teuthology/config.py
+++ b/teuthology/config.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 import os
 import yaml
 import logging
@@ -15,12 +14,11 @@ class _Config(object):
     ~/.teuthology.yaml and nothing else.
     """
     def __init__(self):
-        if not os.path.exists(CONF_FILE):
+        if os.path.exists(CONF_FILE):
+            self.__conf = yaml.safe_load(file(CONF_FILE))
+        else:
             log.debug("%s not found", CONF_FILE)
             self.__conf = {}
-            return
-
-        self.__conf = yaml.safe_load(file(CONF_FILE))
 
     # This property declaration exists mainly as an example; it is not
     # necessary unless you want to, say, define a set method and/or a