Merge pull request #2 from pyload/stable

sync with stable

1 files changed, 8 insertions, 3 deletions

diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py
index 08b1bad0c..c84c0439d 100644
--- a/module/plugins/hooks/IRCInterface.py
+++ b/module/plugins/hooks/IRCInterface.py
@@ -18,7 +18,7 @@ from module.utils import formatSize
 class IRCInterface(Thread, Addon):
     __name__    = "IRCInterface"
     __type__    = "hook"
-    __version__ = "0.15"
+    __version__ = "0.17"
     __status__  = "testing"
 
     __config__ = [("host"     , "str" , "IRC-Server Address"                           , "Enter your server here!"),
@@ -40,7 +40,7 @@ class IRCInterface(Thread, Addon):
     def __init__(self, core, manager):
         Thread.__init__(self)
         Addon.__init__(self, core, manager)
-        self.set_daemon(True)
+        self.setDaemon(True)
 
 
     def activate(self):
@@ -55,6 +55,7 @@ class IRCInterface(Thread, Addon):
         try:
             if self.get_config('info_pack'):
                 self.response(_("Package finished: %s") % pypack.name)
+
         except Exception:
             pass
 
@@ -64,6 +65,7 @@ class IRCInterface(Thread, Addon):
             if self.get_config('info_file'):
                 self.response(
                     _("Download finished: %(name)s @ %(plugin)s ") % {'name': pyfile.name, 'plugin': pyfile.pluginname})
+
         except Exception:
             pass
 
@@ -103,7 +105,8 @@ class IRCInterface(Thread, Addon):
 
         except IRCError, ex:
             self.sock.send("QUIT :byebye\r\n")
-            traceback.print_exc()
+            if self.pyload.debug:
+                traceback.print_exc()
             self.sock.close()
 
 
@@ -177,6 +180,7 @@ class IRCInterface(Thread, Addon):
             trigger = temp[0]
             if len(temp) > 1:
                 args = temp[1:]
+
         except Exception:
             pass
 
@@ -185,6 +189,7 @@ class IRCInterface(Thread, Addon):
             res = handler(args)
             for line in res:
                 self.response(line, msg['origin'])
+
         except Exception, e:
             self.log_error(e)