commit 31af7760de8f9a582c2631ef818a7346620cfc39 Author: Daniel Martí <mvdan@mvdan.cc> Date: Thu Aug 21 17:38:15 2014 +0200 Don't override built-in name 'dir' --- lib/chutney/TorNet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 35deb41..d343688 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -441,12 +441,12 @@ class LocalNodeController(NodeController): pid = self.getPid() running = self.isRunning(pid) nick = self._env['nick'] - dir = self._env['dir'] + datadir = self._env['dir'] if running: if listRunning: print "%s is running with PID %s" % (nick, pid) return True - elif os.path.exists(os.path.join(dir, "core.%s" % pid)): + elif os.path.exists(os.path.join(datadir, "core.%s" % pid)): if listNonRunning: print "%s seems to have crashed, and left core file core.%s" % ( nick, pid)