diff options
| author | Sascha Silbe <sascha@silbe.org> | 2009-10-23 11:46:38 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha@silbe.org> | 2009-10-23 11:46:38 (GMT) |
| commit | 21d9cca225d3fa0e3c8e58714f42a30048f7b565 (patch) | |
| tree | f0e3ad6d1e75073ec9566a48e8b228756736d9e7 | |
| parent | fc32691840654f7b7215f2c34943e6ef8a138dd8 (diff) | |
| parent | 5a220fb903b62d3b3e2cbf8bba42f1a1ad8f028e (diff) | |
Merge commit 'refs/top-bases/t/sugar-reap-bin' into t/sugar-reap-binrefs/top-bases/t/sugar-reap-bin+vnct/sugar-reap-bin
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/jarabe/journal/model.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b846c23..2782825 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT([Sugar],[0.86.2],[],[sugar]) +AC_INIT([Sugar],[0.86.3],[],[sugar]) AC_PREREQ([2.59]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([configure.ac]) -SUCROSE_VERSION="0.86.2" +SUCROSE_VERSION="0.86.3" AC_SUBST(SUCROSE_VERSION) AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py index 5deff6a..85b4f46 100644 --- a/src/jarabe/journal/model.py +++ b/src/jarabe/journal/model.py @@ -182,7 +182,7 @@ class BaseResultSet(object): logging.debug('prepending one more page, offset: %r limit: %r', self._offset, limit) query = self._query.copy() - query['limit'] = self._page_size + query['limit'] = limit query['offset'] = self._offset entries, self._total_count = self.find(query) |