summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks/MergeFiles.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-09-29 21:57:38 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-09-29 21:57:38 +0200
commit0af040e72ad8345ce4ecc6952dcf4fe4dc28f4ff (patch)
tree3f4f9e27717792ac1a0cf9730c113662ea106e24 /module/plugins/hooks/MergeFiles.py
parentUpdate crypter plugins (diff)
downloadpyload-0af040e72ad8345ce4ecc6952dcf4fe4dc28f4ff.tar.xz
Update addon plugins
Diffstat (limited to 'module/plugins/hooks/MergeFiles.py')
-rw-r--r--module/plugins/hooks/MergeFiles.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py
index a76a578bf..c6405e5a3 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -4,7 +4,6 @@ from __future__ import with_statement
import os
import re
-import traceback
from module.plugins.internal.Addon import Addon, threaded
from module.utils import save_join as fs_join
@@ -13,7 +12,7 @@ from module.utils import save_join as fs_join
class MergeFiles(Addon):
__name__ = "MergeFiles"
__type__ = "hook"
- __version__ = "0.16"
+ __version__ = "0.17"
__status__ = "testing"
__config__ = [("activated", "bool", "Activated", True)]
@@ -69,7 +68,7 @@ class MergeFiles(Addon):
self.log_debug("Finished merging part", splitted_file)
except Exception, e:
- traceback.print_exc()
+ self.log_error(e)
finally:
pyfile.setProgress(100)