diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-12-15 19:18:51 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-12-15 19:20:18 (GMT) |
| commit | c263e68728d166d5e4cd7d5c84fb05d4fbd7e597 (patch) | |
| tree | 9bf943be2cea91981096fd199c29061c29c26e76 | |
| parent | 652bf5efb9ecfbeb0e7641d92f451fc25330c2be (diff) | |
Revert "#2545: Just log a warning when unmounting a device that has already been removed."
Marco has expressed concerns about this patch. Reverting until we agree on this.
This reverts commit 05f0b1c82be71c342551e2bdc2f7f927f6215beb.
| -rw-r--r-- | src/olpc/datastore/backingstore.py | 14 | ||||
| -rw-r--r-- | src/olpc/datastore/xapianindex.py | 7 |
2 files changed, 6 insertions, 15 deletions
diff --git a/src/olpc/datastore/backingstore.py b/src/olpc/datastore/backingstore.py index c8e90aa..12dc582 100644 --- a/src/olpc/datastore/backingstore.py +++ b/src/olpc/datastore/backingstore.py @@ -22,8 +22,6 @@ import threading import errno import shutil import urllib -import traceback -import sys import dbus import xapian @@ -269,13 +267,11 @@ class FileBackingStore(BackingStore): if 'uri' not in desc: desc['uri'] = self.uri if 'title' not in desc: desc['title'] = self.uri - try: - fp = open(fn, 'w') - pickle.dump(desc, fp) - fp.close() - except Exception: - logging.error('Unable to write descriptor:\n' + \ - ''.join(traceback.format_exception(*sys.exc_info()))) + + fp = open(fn, 'w') + pickle.dump(desc, fp) + fp.close() + @staticmethod def parse(uri): diff --git a/src/olpc/datastore/xapianindex.py b/src/olpc/datastore/xapianindex.py index a859aa9..d071eba 100644 --- a/src/olpc/datastore/xapianindex.py +++ b/src/olpc/datastore/xapianindex.py @@ -22,7 +22,6 @@ import time import thread import threading import warnings -import traceback import secore import xapian as _xapian # we need to modify the QueryParser @@ -166,11 +165,7 @@ class IndexManager(object): self.deltact += 1 if force or self.deltact > FLUSH_THRESHOLD: with self._write_lock: - try: - self.write_index.flush() - except Exception: - logging.error('Index flush failed:\n' + \ - ''.join(traceback.format_exception(*sys.exc_info()))) + self.write_index.flush() #self.read_index.reopen() self.deltact = 0 else: |