Merge branch 'master' of /users/git/public/pyceo

2011-03-09 04:04:44 -05:00 · 2011-03-09 04:04:44 -05:00 · 1781e9bb83
commit 1781e9bb83
parent d866c4ce66 3c61210328
2 changed files with 7 additions and 1 deletions
--- a/ceo/urwid/library.py
+++ b/ceo/urwid/library.py
@ -284,7 +284,7 @@ class SearchPage(urwid.WidgetWrap):
            for s in st:
                books.append(s.book)

-        if not books.count():
+        if ((type(books) != type([])) and books.count() == 0) or books == []:
            widgets.append(urwid.Text("No results. Hit ESC to return to search page."))
            widgets.append(urwid.Divider())

--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+ceo (0.5.11) stable; urgency=low
+
+  * Fix library check in and search bug introduced in 0.5.9+nmu1.
+
+ -- Marc Burns <m4burns@csclub.uwaterloo.ca>  Fri, 04 Mar 2011 16:52:32 -0500
+
 ceo (0.5.10) stable; urgency=low

  * Fix squeeze build warnings