diff options
author | makefu <root@pigstarter.de> | 2014-04-25 13:38:18 +0200 |
---|---|---|
committer | makefu <root@pigstarter.de> | 2014-04-25 13:38:18 +0200 |
commit | 8d4c5b69c6d7bb9774b49f68db6570ebd2681505 (patch) | |
tree | e2c19554f5d1702eb0856d82f691cfce610f3a39 /IRC/reaktor.py | |
parent | c7e714ff331761a3c50d47e3b5a4834de92c2adc (diff) | |
parent | 97e2b11759fe3066b3d12bb9d47c981959c3cde8 (diff) |
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'IRC/reaktor.py')
-rwxr-xr-x | IRC/reaktor.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/IRC/reaktor.py b/IRC/reaktor.py index b53ef65..bfd08d9 100755 --- a/IRC/reaktor.py +++ b/IRC/reaktor.py @@ -36,7 +36,7 @@ class Reaktor(asybot): return False def on_join(self, prefix, command, params, rest): - for command in getconf('on_join'): + for command in getconf('on_join', []): self.execute_command(command, None, prefix, params) def on_privmsg(self, prefix, command, params, rest): @@ -81,7 +81,6 @@ class Reaktor(asybot): target.append(env['_from']) log.debug('target:' +str(target)) - env['config_filename'] = os.path.abspath(self.config) start = time() try: p = popen(myargv, bufsize=1, stdout=PIPE, stderr=PIPE, env=env, cwd=cwd) |