mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Remove user plugins with name conflicts automatically
This commit is contained in:
parent
17a6ff32f0
commit
60bbc8d002
@ -514,9 +514,11 @@ def initialize_plugin(plugin, path_to_zip_file):
|
|||||||
def initialize_plugins():
|
def initialize_plugins():
|
||||||
global _initialized_plugins
|
global _initialized_plugins
|
||||||
_initialized_plugins = []
|
_initialized_plugins = []
|
||||||
user_plugins = [p for name, p in config['plugins'].iteritems() if name not
|
conflicts = [name for name in config['plugins'] if name in
|
||||||
in builtin_names]
|
builtin_names]
|
||||||
for zfp in user_plugins + builtin_plugins:
|
for p in conflicts:
|
||||||
|
remove_plugin(p)
|
||||||
|
for zfp in list(config['plugins'].itervalues()) + builtin_plugins:
|
||||||
try:
|
try:
|
||||||
try:
|
try:
|
||||||
plugin = load_plugin(zfp) if not isinstance(zfp, type) else zfp
|
plugin = load_plugin(zfp) if not isinstance(zfp, type) else zfp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user