[calibre] Fix no-update patch to prevent exception when trying to close the Plugin Preferences dialog (BZ #769
Christian Krause
chkr at fedoraproject.org
Sat Dec 31 00:30:18 UTC 2011
commit ac1043ee0582a8c2f455c01df223868db6139cc0
Author: Christian Krause <chkr at fedoraproject.org>
Date: Sat Dec 31 01:30:14 2011 +0100
Fix no-update patch to prevent exception when trying to close
the Plugin Preferences dialog (BZ #769714)
calibre-no-update.patch | 23 ++++++++++-------------
calibre.spec | 6 +++++-
2 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/calibre-no-update.patch b/calibre-no-update.patch
index 3a0e8d7..66b4bb7 100644
--- a/calibre-no-update.patch
+++ b/calibre-no-update.patch
@@ -1,31 +1,28 @@
diff -uNr calibre.old/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py
---- calibre.old/src/calibre/gui2/ui.py 2011-06-26 19:51:17.912975862 +0200
-+++ calibre/src/calibre/gui2/ui.py 2011-06-26 19:52:21.156346644 +0200
-@@ -647,7 +647,7 @@
+--- calibre.old/src/calibre/gui2/ui.py 2011-12-30 17:12:37.909499254 +0100
++++ calibre/src/calibre/gui2/ui.py 2011-12-30 17:14:33.899450513 +0100
+@@ -681,7 +681,8 @@
if write_settings:
self.write_settings()
self.check_messages_timer.stop()
- self.update_checker.terminate()
-+ # self.update_checker.terminate()
++ if self.update_checker:
++ self.update_checker.terminate()
self.listener.close()
self.job_manager.server.close()
self.job_manager.threaded_server.close()
diff -uNr calibre.old/src/calibre/gui2/update.py calibre/src/calibre/gui2/update.py
---- calibre.old/src/calibre/gui2/update.py 2011-06-26 19:51:17.913975852 +0200
-+++ calibre/src/calibre/gui2/update.py 2011-06-26 19:56:50.608665533 +0200
-@@ -121,13 +121,13 @@
+--- calibre.old/src/calibre/gui2/update.py 2011-12-30 17:12:37.910499245 +0100
++++ calibre/src/calibre/gui2/update.py 2011-12-30 17:14:11.307655638 +0100
+@@ -122,11 +122,11 @@
- class UpdateMixin(object):
-
-- def __init__(self, opts):
-- self.last_newest_calibre_version = NO_CALIBRE_UPDATE
+ def __init__(self, opts):
+ self.last_newest_calibre_version = NO_CALIBRE_UPDATE
- if not opts.no_update_check:
- self.update_checker = CheckForUpdates(self)
- self.update_checker.update_found.connect(self.update_found,
- type=Qt.QueuedConnection)
- self.update_checker.start()
-+ #def __init__(self, opts):
-+ #self.last_newest_calibre_version = NO_CALIBRE_UPDATE
+ #if not opts.no_update_check:
+ # self.update_checker = CheckForUpdates(self)
+ # self.update_checker.update_found.connect(self.update_found,
diff --git a/calibre.spec b/calibre.spec
index 6705ffe..4b9c5aa 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -2,7 +2,7 @@
Name: calibre
Version: 0.8.33
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: E-book converter and library management
Group: Applications/Multimedia
License: GPLv3
@@ -255,6 +255,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man1/*
%changelog
+* Sat Dec 31 2011 Christian Krause <chkr at fedoraproject.org> - 0.8.33-2
+- Fix no-update patch to prevent exception when trying to close
+ the Plugin Preferences dialog (BZ #769714)
+
* Fri Dec 30 2011 Kevin Fenzi <kevin at scrye.com> - 0.8.33-1
- Update to 0.8.33
More information about the scm-commits
mailing list