summaryrefslogtreecommitdiffstats
path: root/pyload/manager/Addon.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-12 19:23:51 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-12 19:23:51 +0200
commitf0afbee15380bf5fc242fb3dd5439a9ea9c67d5c (patch)
tree7e82c022c157a39232fc590ab2ffa69787f5d260 /pyload/manager/Addon.py
parentCleanup (diff)
parentimport fixes + code-cleanup (diff)
downloadpyload-f0afbee15380bf5fc242fb3dd5439a9ea9c67d5c.tar.xz
Merge branch 'pr/n3_ardi69' into 0.4.10
Conflicts: pyload/plugin/Plugin.py pyload/webui/app/pyloadweb.py
Diffstat (limited to 'pyload/manager/Addon.py')
-rw-r--r--pyload/manager/Addon.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyload/manager/Addon.py b/pyload/manager/Addon.py
index 26a2735cf..9ce3a4f8f 100644
--- a/pyload/manager/Addon.py
+++ b/pyload/manager/Addon.py
@@ -121,7 +121,7 @@ class AddonManager(object):
except Exception:
self.core.log.warning(_("Failed activating %(name)s") % {"name": pluginname})
- if self.core.debug or True:
+ if self.core.debug:
traceback.print_exc()
self.core.log.info(_("Activated %ss: %s") % (type, ", ".join(sorted(active))))