Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@tomeuvizoso.net>2007-11-07 22:22:45 (GMT)
committer Tomeu Vizoso <tomeu@tomeuvizoso.net>2007-11-07 22:22:45 (GMT)
commitab952c6b61bb6f6c6a18660da37032cfa6d4d78e (patch)
tree6fdcf71e740497c67fafbdf644e6d8ed3e6c9039
parent30b104bb755c7c134298d92170f5883067d50bf8 (diff)
Release version 69.
-rw-r--r--NEWS2
-rwxr-xr-xactivity/activity.info2
-rw-r--r--misc.py7
3 files changed, 8 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 2e242d7..dda70da 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+69
+
* #4704 Fix mounting of removable devices. (tomeu)
68
diff --git a/activity/activity.info b/activity/activity.info
index 8faf222..e4181aa 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Journal
-activity_version = 68
+activity_version = 69
service_name = org.laptop.JournalActivity
icon = activity-journal
class = journalactivity.JournalActivity
diff --git a/misc.py b/misc.py
index abc4060..02ae039 100644
--- a/misc.py
+++ b/misc.py
@@ -48,8 +48,11 @@ def get_icon_name(jobject):
try:
bundle = ActivityBundle(jobject.file_path)
file_name = bundle.get_icon()
- except IOError, e:
- logging.warning('Could not read bundle: %r' % e)
+ except IOError:
+ import traceback
+ import sys
+ logging.warning('Could not read bundle:\n' + \
+ ''.join(traceback.format_exception(*sys.exc_info())))
return _get_icon_file_name('application-octet-stream')
except MalformedBundleException, e:
logging.warning('Incorrect bundle: %r' % e)