From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 7 May 2009 01:08:22 +0000 (+0000)
Subject: stop looking for config files once we've found one
X-Git-Tag: sfa-0.9-0@14641~398
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=27f29e0449cf0a8914bd9819f2203b019a5643da;p=sfa.git

stop looking for config files once we've found one
---

diff --git a/geni/util/config.py b/geni/util/config.py
index e99674cf..a45bb68a 100644
--- a/geni/util/config.py
+++ b/geni/util/config.py
@@ -16,6 +16,8 @@
 
 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"
 
@@ -36,9 +38,11 @@ class Config:
         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