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 | 8070f4a259cc02983ca7d3c8e86cb8da816a5c3b (patch) | |
| tree | 9785c0db5c0b0f88c2f2eecf476eb1c7b22c56a6 /Reaktor/IRC/reaktor.py | |
| parent | c35d7c4e017baa57c14f1fb4b48f18e153ced549 (diff) | |
| parent | 7bf0b790b95d97d33e57a4e52cf7681bc6366d98 (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'Reaktor/IRC/reaktor.py')
| -rwxr-xr-x | Reaktor/IRC/reaktor.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Reaktor/IRC/reaktor.py b/Reaktor/IRC/reaktor.py index b53ef651..bfd08d9f 100755 --- a/Reaktor/IRC/reaktor.py +++ b/Reaktor/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) |