Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-10-06 09:15:36 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-10-06 09:15:36 (GMT)
commitc74013db1ffc19fb7d5de1cda8c80ed7123f42dd (patch)
tree4fa4d5e9b7ebe97888f7fbe377093dbb60986f8e /sugar
parent79ba6b91b7dff82a546663423dfa684404f55c79 (diff)
Timeout of 120 seconds for mount to work around jffs2 issues.
Diffstat (limited to 'sugar')
-rw-r--r--sugar/datastore/datastore.py4
-rw-r--r--sugar/datastore/dbus_helpers.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/sugar/datastore/datastore.py b/sugar/datastore/datastore.py
index 0a7be50..7c1b57b 100644
--- a/sugar/datastore/datastore.py
+++ b/sugar/datastore/datastore.py
@@ -291,8 +291,8 @@ def copy(jobject, mount_point):
write(new_jobject)
-def mount(uri, options):
- return dbus_helpers.mount(uri, options)
+def mount(uri, options, timeout=-1):
+ return dbus_helpers.mount(uri, options, timeout=timeout)
def unmount(mount_point_id):
dbus_helpers.unmount(mount_point_id)
diff --git a/sugar/datastore/dbus_helpers.py b/sugar/datastore/dbus_helpers.py
index 752b0cc..a5ce9c8 100644
--- a/sugar/datastore/dbus_helpers.py
+++ b/sugar/datastore/dbus_helpers.py
@@ -82,8 +82,8 @@ def find(query, properties, reply_handler, error_handler):
else:
return _get_data_store().find(query, properties)
-def mount(uri, options):
- return _get_data_store().mount(uri, options)
+def mount(uri, options, timeout=-1):
+ return _get_data_store().mount(uri, options, timeout=timeout)
def unmount(mount_point_id):
_get_data_store().unmount(mount_point_id)