# HG changeset patch
# User Olivier Breuleux <breuleuo@iro.umontreal.ca>
# Date 1231804006 18000
# Node ID 7ddb286162f66656aa6ca983ece7c38e5d264697
# Parent  86a63770af249e364e3172ac621a4a4103b7ff29
corrected filemerge

diff -r 86a63770af24 -r 7ddb286162f6 pylearn/dbdict/newstuff.py
--- a/pylearn/dbdict/newstuff.py	Thu Dec 18 20:10:35 2008 -0500
+++ b/pylearn/dbdict/newstuff.py	Mon Jan 12 18:46:46 2009 -0500
@@ -590,8 +590,11 @@
     with open(mainfile) as f:
         _state = parse(*map(str.strip, f.readlines()))
     for file in other_files:
-        with open(file) as f:
-            _state.update(parse(*map(str.strip, f.readlines())))
+        if '=' in file:
+            _state.update(parse(file))
+        else:
+            with open(file) as f:
+                _state.update(parse(*map(str.strip, f.readlines())))
     state = expand(_state)
     state.setdefault('dbdict', DD()).experiment = experiment
     experiment = resolve(experiment)