Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/olpc/datastore/datastore.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/olpc/datastore/datastore.py')
-rw-r--r--src/olpc/datastore/datastore.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/olpc/datastore/datastore.py b/src/olpc/datastore/datastore.py
index 34eb23c..d026fce 100644
--- a/src/olpc/datastore/datastore.py
+++ b/src/olpc/datastore/datastore.py
@@ -256,7 +256,10 @@ class DataStore(dbus.service.Object):
# only goes to the primary now. Punting on the merge case
if isinstance(query, dict):
kwargs.update(query)
-
+ else:
+ if 'query' not in kwargs:
+ kwargs['query'] = query
+
include_files = kwargs.pop('include_files', False)
order_by = kwargs.pop('order_by', [])