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:
95ebabe
)
refactored
author
Tony Mack
<tmack@cs.princeton.edu>
Sun, 3 May 2009 01:05:25 +0000
(
01:05
+0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Sun, 3 May 2009 01:05:25 +0000
(
01:05
+0000)
geni/aggregate.py
patch
|
blob
|
history
diff --git
a/geni/aggregate.py
b/geni/aggregate.py
index
33fd3ab
..
add3444
100644
(file)
--- a/
geni/aggregate.py
+++ b/
geni/aggregate.py
@@
-44,7
+44,7
@@
class Aggregates(dict):
connection_dict = {}
for field in self.required_fields:
connection_dict[field] = ''
connection_dict = {}
for field in self.required_fields:
connection_dict[field] = ''
-
+ aggregates_dict = {'aggregates': {'aggregate': [connection_dict]}}
# get possible config file locations
loaded = False
path = os.path.dirname(os.path.abspath(__file__))
# get possible config file locations
loaded = False
path = os.path.dirname(os.path.abspath(__file__))
@@
-55,13
+55,13
@@
class Aggregates(dict):
for f in files:
try:
if os.path.isfile(f):
for f in files:
try:
if os.path.isfile(f):
- self.aggregate_info = XmlStorage(f,
{'aggregates': {'aggregate': [connection_dict]}}
)
+ self.aggregate_info = XmlStorage(f,
aggregates_dict
)
loaded = True
except: pass
# if file is missing, just recreate it in the right place
if not loaded:
loaded = True
except: pass
# if file is missing, just recreate it in the right place
if not loaded:
- self.aggregate_info = XmlStorage(file,
{'aggregates': {'aggregate': [connection_dict]}}
)
+ self.aggregate_info = XmlStorage(file,
aggregates_dict
)
self.aggregate_info.load()
self.connectAggregates()
self.aggregate_info.load()
self.connectAggregates()