diff options
Diffstat (limited to 'rpms/sugar/0069-Journal-detail-view-don-t-choke-on-invalid-keep-prop.patch')
| -rw-r--r-- | rpms/sugar/0069-Journal-detail-view-don-t-choke-on-invalid-keep-prop.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/rpms/sugar/0069-Journal-detail-view-don-t-choke-on-invalid-keep-prop.patch b/rpms/sugar/0069-Journal-detail-view-don-t-choke-on-invalid-keep-prop.patch new file mode 100644 index 0000000..abbc34f --- /dev/null +++ b/rpms/sugar/0069-Journal-detail-view-don-t-choke-on-invalid-keep-prop.patch @@ -0,0 +1,47 @@ +From ac10b142b66af9e94decf41cde1aa345ee2cb638 Mon Sep 17 00:00:00 2001 +From: Sascha Silbe <silbe@activitycentral.com> +Date: Wed, 18 Jan 2012 01:56:22 +0000 +Subject: [PATCH sugar 69/74] Journal detail view: don't choke on invalid + 'keep' property (fixes SL#1591) + +Properties of data store entries can get corrupted, e.g. due to low level +crashes or running out of battery (see OLPC#11372 [1] for a real-life +example). In addition any activity can - accidentally or on purpose - write +data store entries with arbitrary metadata. + +By comparing the 'keep' property as a string we can avoid the ValueError that +might happen when trying to convert the property value to an integer. + +[1] https://dev.laptop.org/ticket/11372 + +Reported-by: Gary Martin <garycmartin@googlemail.com> +Signed-off-by: Sascha Silbe <silbe@activitycentral.com> +--- + src/jarabe/journal/expandedentry.py | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py +index 4e99dc2..03f8cd1 100644 +--- a/src/jarabe/journal/expandedentry.py ++++ b/src/jarabe/journal/expandedentry.py +@@ -144,7 +144,7 @@ def set_metadata(self, metadata): + return + self._metadata = metadata + +- self._keep_icon.keep = (int(metadata.get('keep', 0)) == 1) ++ self._keep_icon.keep = (str(metadata.get('keep', 0)) == '1') + + self._icon = self._create_icon() + self._icon_box.clear() +@@ -419,7 +419,7 @@ def _update_entry(self, needs_update=False): + self._update_title_sid = None + + def get_keep(self): +- return int(self._metadata.get('keep', 0)) == 1 ++ return (str(self._metadata.get('keep', 0)) == '1') + + def _keep_icon_activated_cb(self, keep_icon): + if self.get_keep(): +-- +1.7.6 + |