diff options
| author | Bernie Innocenti <bernie@codewiz.org> | 2010-08-03 12:18:13 (GMT) |
|---|---|---|
| committer | Bernie Innocenti <bernie@codewiz.org> | 2010-08-03 12:18:13 (GMT) |
| commit | 4b388f39c5ab3b7761950a377451caf8aa53a754 (patch) | |
| tree | a33490ca57d2bf490ab7c5acaa38aa1a7a3775df /rpms | |
| parent | 2241d51c8a02a79e9d7a4f3a295e0b825877d44c (diff) | |
Add another fix for sl2132
Diffstat (limited to 'rpms')
| -rw-r--r-- | rpms/sugar-datastore/sl2132-set-index_updated-flag-on-ds-shutting-down.patch | 32 | ||||
| -rw-r--r-- | rpms/sugar-datastore/sugar-datastore.spec | 4 |
2 files changed, 35 insertions, 1 deletions
diff --git a/rpms/sugar-datastore/sl2132-set-index_updated-flag-on-ds-shutting-down.patch b/rpms/sugar-datastore/sl2132-set-index_updated-flag-on-ds-shutting-down.patch new file mode 100644 index 0000000..bbe1699 --- /dev/null +++ b/rpms/sugar-datastore/sl2132-set-index_updated-flag-on-ds-shutting-down.patch @@ -0,0 +1,32 @@ +From 7faf55c9466b13c2e16f6242373a6e9bf5a27f8e Mon Sep 17 00:00:00 2001 +From: Aleksey Lim <alsroot@member.fsf.org> +Date: Thu, 29 Jul 2010 21:21:37 +0000 +Subject: Set index_updated flag on ds shutting down + + +diff --git a/src/carquinyol/indexstore.py b/src/carquinyol/indexstore.py +index fbef496..e36f9a7 100644 +--- a/src/carquinyol/indexstore.py ++++ b/src/carquinyol/indexstore.py +@@ -226,7 +226,7 @@ class IndexStore(object): + if not self._database: + return + +- self._database.flush() ++ self._flush(True) + self._database = None + + def remove_index(self): +@@ -334,7 +334,8 @@ class IndexStore(object): + + def _flush(self, force=False): + """Called after any database mutation""" +- logging.debug('IndexStore.flush: %r %r', force, self._pending_writes) ++ logging.debug('IndexStore.flush: force=%r _pending_writes=%r', ++ force, self._pending_writes) + + self._set_index_updated(False) + +-- +1.7.0.4 + diff --git a/rpms/sugar-datastore/sugar-datastore.spec b/rpms/sugar-datastore/sugar-datastore.spec index 7c509f1..68771b0 100644 --- a/rpms/sugar-datastore/sugar-datastore.spec +++ b/rpms/sugar-datastore/sugar-datastore.spec @@ -2,7 +2,7 @@ Name: sugar-datastore Version: 0.88.0 -Release: 3.4dxo%{?dist} +Release: 3.6dxo%{?dist} #Release: 2.%{alphatag}%{?dist} Summary: Sugar Datastore @@ -14,6 +14,7 @@ Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-% # Bug fixes Patch1: sl2095-invert-datastore-clean-logic.patch Patch2: sl2132-reduce-_FLUSH_TIMEOUT-to-5sec.patch +Patch3: sl2132-set-index_updated-flag-on-ds-shutting-down.patch # aa's "sort by filesize" patch series #Patch0: sizelist-0000-cover-letter.patch @@ -44,6 +45,7 @@ may become unavailable at times %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 |