diff options
| author |  jansohn <jansohn@users.noreply.github.com>
| 2015-10-02 10:09:26 +0200 |
|---|---|---|
| committer | jansohn <jansohn@users.noreply.github.com>
| 2015-10-02 10:09:26 +0200 |
| commit | 3a08656c5665f4b8db98744fb323e64b8630e084 (patch) | |
| tree | 28f9f62ffc57888b76ca32540dbf5af3a4cfc8d0 /module/plugins/hooks/MergeFiles.py | |
| parent | Merge pull request #1 from pyload/stable (diff) | |
| parent | [Account] Improve parse_traffic method + code cosmetics (diff) | |
| download | pyload-3a08656c5665f4b8db98744fb323e64b8630e084.tar.xz | |
Merge pull request #2 from pyload/stable
sync with stable
Diffstat (limited to 'module/plugins/hooks/MergeFiles.py')
| -rw-r--r-- | module/plugins/hooks/MergeFiles.py | 5 |
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) |