[gnue] r7330 - trunk/gnue-common/src/datasources

[reinhard]

Author: reinhard
Date: 2005-04-08 19:12:30 -0500 (Fri, 08 Apr 2005)
New Revision: 7330

Modified:
   trunk/gnue-common/src/datasources/GConditions.py
Log:
Make sure combineConditions always delivers a GCondition object.


Modified: trunk/gnue-common/src/datasources/GConditions.py
===================================================================
--- trunk/gnue-common/src/datasources/GConditions.py    2005-04-08 23:49:10 UTC 
(rev 7329)
+++ trunk/gnue-common/src/datasources/GConditions.py    2005-04-09 00:12:30 UTC 
(rev 7330)
@@ -1432,10 +1432,10 @@
 
   # check for the trivial cases
   if cond1 is None or cond1 == {}:
-    return cond2
+    return buildCondition (cond2)
 
   elif cond2 is None or cond2 == {}:
-    return cond1
+    return buildCondition (cond1)
 
   # make sure both parts are condition trees
   if isinstance (cond1, types.DictType):