Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@sugarlabs.org>2009-01-14 10:04:05 (GMT)
committer Tomeu Vizoso <tomeu@sugarlabs.org>2009-01-14 10:04:05 (GMT)
commit0497202866aec752a7090661085bba1ac86d3143 (patch)
treeae86512eaa7389b02a7c1638496066de273c7df5 /src
parent869cd108a3cd7c64a46f70f4042966e7ddc971d9 (diff)
Correctly print backtraces
Diffstat (limited to 'src')
-rw-r--r--src/jarabe/desktop/favoritesview.py9
-rw-r--r--src/jarabe/journal/model.py2
2 files changed, 9 insertions, 2 deletions
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 27e1c32..2ce95f4 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -438,7 +438,14 @@ class ActivityIcon(CanvasIcon):
if error is not None:
logging.error('Error retrieving most recent activities: %r' % error)
- self._journal_entries = entries
+ # If there's a problem with the DS index, we may get entries not related
+ # to this activity.
+ checked_entries = []
+ for entry in entries:
+ if entry['activity'] == self.bundle_id:
+ checked_entries.append(entry)
+
+ self._journal_entries = checked_entries
self._update()
def _update(self):
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index b399ad6..663cb12 100644
--- a/src/jarabe/journal/model.py
+++ b/src/jarabe/journal/model.py
@@ -336,7 +336,7 @@ class InplaceResultSet(BaseResultSet):
self.progress.send(self)
except Exception:
- logging.error('Error reading file %r: %r' % \
+ logging.error('Error reading file %r: %s' % \
(full_path, traceback.format_exc()))
if self._pending_directories == 0: