stop looking for config files once we've found one

[sfa.git] / geni / util / config.py

diff --git a/geni/util/config.py b/geni/util/config.py
index 59b330c..a45bb68 100644 (file)
--- a/geni/util/config.py
+++ b/geni/util/config.py
@@ -16,10 +16,12 @@
 
 import os
 import sys
+from geni.util.debug import log
+import traceback
 
 geni =  os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))+ os.sep + "geni"
 
-class Config(dict):
+class Config:
     """
     Parse the bash/Python/PHP version of the configuration file. Very
     fast but no type conversions.
@@ -36,9 +38,11 @@ class Config(dict):
         files = [file, alt_file, geni_file]
 
         for file in files:
-            try: 
+            try:
                 execfile(file, self.__dict__)
                 loaded = True
+                self.config_file = file
+                break
             except:
                 pass