git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5a1c0f8
)
stop looking for config files once we've found one
author
Tony Mack
<tmack@cs.princeton.edu>
Thu, 7 May 2009 01:08:22 +0000
(
01:08
+0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Thu, 7 May 2009 01:08:22 +0000
(
01:08
+0000)
geni/util/config.py
patch
|
blob
|
history
diff --git
a/geni/util/config.py
b/geni/util/config.py
index
e99674c
..
a45bb68
100644
(file)
--- 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