When checking for updated plugins do not connect to the plugin index if no external plugins are installed

This commit is contained in:
Kovid Goyal 2011-06-14 12:09:35 -06:00
parent f476ac4645
commit d24bd6e57c
2 changed files with 6 additions and 1 deletions

View File

@ -493,6 +493,8 @@ def initialize_plugin(plugin, path_to_zip_file):
raise InvalidPlugin((_('Initialization of plugin %s failed with traceback:') raise InvalidPlugin((_('Initialization of plugin %s failed with traceback:')
%tb) + '\n'+tb) %tb) + '\n'+tb)
def has_external_plugins():
return bool(config['plugins'])
def initialize_plugins(): def initialize_plugins():
global _initialized_plugins global _initialized_plugins

View File

@ -17,7 +17,8 @@ from PyQt4.Qt import (Qt, QUrl, QFrame, QVBoxLayout, QLabel, QBrush, QTextEdit,
from calibre import browser, prints from calibre import browser, prints
from calibre.constants import numeric_version, iswindows, isosx, DEBUG from calibre.constants import numeric_version, iswindows, isosx, DEBUG
from calibre.customize.ui import (initialized_plugins, is_disabled, remove_plugin, from calibre.customize.ui import (initialized_plugins, is_disabled, remove_plugin,
add_plugin, enable_plugin, disable_plugin, NameConflict) add_plugin, enable_plugin, disable_plugin,
NameConflict, has_external_plugins)
from calibre.gui2 import error_dialog, question_dialog, info_dialog, NONE, open_url, gprefs from calibre.gui2 import error_dialog, question_dialog, info_dialog, NONE, open_url, gprefs
from calibre.gui2.preferences.plugins import ConfigWidget from calibre.gui2.preferences.plugins import ConfigWidget
from calibre.utils.date import UNDEFINED_DATE, format_date from calibre.utils.date import UNDEFINED_DATE, format_date
@ -38,6 +39,8 @@ def get_plugin_updates_available():
Returns None if no updates found Returns None if no updates found
Returns list(DisplayPlugin) of plugins installed that have a new version Returns list(DisplayPlugin) of plugins installed that have a new version
''' '''
if not has_external_plugins():
return None
display_plugins = read_available_plugins() display_plugins = read_available_plugins()
if display_plugins: if display_plugins:
update_plugins = filter(filter_upgradeable_plugins, display_plugins) update_plugins = filter(filter_upgradeable_plugins, display_plugins)