diff options
| author | makefu <github@syntax-fehler.de> | 2015-09-04 22:45:07 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-09-04 22:45:07 +0200 |
| commit | 9d482e1b1e6b399e1c2c01194017c2f6248cdf6e (patch) | |
| tree | 916eec87ca3d4fe8ec52abb3628f62cc7a793694 | |
| parent | 1ed3938e5f8980316788781d4f5708692a1e7e3a (diff) | |
Reaktor: fixes nick change
| -rw-r--r-- | Reaktor/TESTS | 4 | ||||
| -rw-r--r-- | Reaktor/reaktor/__init__.py | 2 | ||||
| -rwxr-xr-x | Reaktor/reaktor/core.py | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Reaktor/TESTS b/Reaktor/TESTS new file mode 100644 index 00000000..d83394ed --- /dev/null +++ b/Reaktor/TESTS @@ -0,0 +1,4 @@ +# TESTME environment override Issue +- PATH in config for command +- PATH in os.environ +- PATH should get overwritten by config but os.environ persisted diff --git a/Reaktor/reaktor/__init__.py b/Reaktor/reaktor/__init__.py index de2aaa4a..dd694a06 100644 --- a/Reaktor/reaktor/__init__.py +++ b/Reaktor/reaktor/__init__.py @@ -1 +1 @@ -__version__="0.4.2" +__version__="0.4.3" diff --git a/Reaktor/reaktor/core.py b/Reaktor/reaktor/core.py index e6250df9..eb8d9824 100755 --- a/Reaktor/reaktor/core.py +++ b/Reaktor/reaktor/core.py @@ -79,7 +79,7 @@ class Reaktor(asybot): log.debug("nickname differs ('{}' to '{}')".format( self.nickname, self.getconf('name'))) - os.environ['IRC_NICKNAME'] = self.nickname + os.environ['REAKTOR_NICKNAME'] = self.nickname self.getconf = make_getconf(self.config) log.info('nickname changed to {}'.format(self.getconf('name'))) @@ -116,11 +116,14 @@ class Reaktor(asybot): log.error("Workdir '%s' is not Writable! Falling back to root dir"%cwd) cwd = "/" - env = command.get('env', {}) + env = {} + + env.update(os.environ) # first merge os.environ + env.update(command.get('env', {})) # then env of cfg + env['_prefix'] = prefix env['_from'] = prefix.split('!', 1)[0] - env.update(os.environ) log.debug('self:' +self.nickname) # when receiving /query, answer to the user, not to self if self.nickname in target: |