summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-10-09 23:20:31 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-10-09 23:20:31 +0200
commitc7d51a1a1b43bacddf3bc6a45d86e77a0f7f2b5f (patch)
tree23777e84a288fc4e2c933c0364c4c086647b8863 /module
parentMerge pull request #1989 from thadrien/pull-request-OneFichierCom-1 (diff)
parentUpdate UpdateManager.py (diff)
downloadpyload-c7d51a1a1b43bacddf3bc6a45d86e77a0f7f2b5f.tar.xz
Merge pull request #1994 from GammaC0de/patch-3
[UpdateManager] fix not deleting blacklisted hook plugins
Diffstat (limited to 'module')
-rw-r--r--module/plugins/hooks/UpdateManager.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index 96b563ddf..fdaa928eb 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -16,7 +16,7 @@ from module.utils import fs_encode, save_join as fs_join
class UpdateManager(Addon):
__name__ = "UpdateManager"
__type__ = "hook"
- __version__ = "0.57"
+ __version__ = "0.58"
__status__ = "testing"
__config__ = [("activated" , "bool", "Activated" , True ),
@@ -311,6 +311,11 @@ class UpdateManager(Addon):
for dir in ("userplugins", rootplugins):
py_filename = fs_join(dir, type, name + ".py")
+
+ #@TODO: Remove in 0.4.10
+ if type == "hook":
+ py_filename = fs_join(dir, "hooks" , name + ".py")
+
pyc_filename = py_filename + "c"
if type == "hook":