commit 55715649eb0dc2daa1bf6931b500f145c3156dce Author: Ignacio Gago igago@ucm.es Date: Sat Dec 13 19:18:31 2014 +0100

Remove old configuration files before configure --- lib/chutney/TorNet.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 7e64035..bc0e355 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -20,6 +20,7 @@ import sys import re import errno import time +import shutil

import chutney.Templating import chutney.Traffic @@ -747,11 +748,11 @@ class Network(object): n.getBuilder().checkConfig(self)

def configure(self): + shutil.rmtree(os.path.join(os.getcwd(),'net','nodes'),ignore_errors=True) network = self altauthlines = [] bridgelines = [] builders = [n.getBuilder() for n in self._nodes] - self._checkConfig()

# XXX don't change node names or types or count if anything is