浏览代码

Remove old configuration files before configure

Ignacio Gago 9 年之前
父节点
当前提交
55715649eb
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      lib/chutney/TorNet.py

+ 2 - 1
lib/chutney/TorNet.py

@@ -20,6 +20,7 @@ import sys
 import re
 import re
 import errno
 import errno
 import time
 import time
+import shutil
 
 
 import chutney.Templating
 import chutney.Templating
 import chutney.Traffic
 import chutney.Traffic
@@ -747,11 +748,11 @@ class Network(object):
             n.getBuilder().checkConfig(self)
             n.getBuilder().checkConfig(self)
 
 
     def configure(self):
     def configure(self):
+        shutil.rmtree(os.path.join(os.getcwd(),'net','nodes'),ignore_errors=True)
         network = self
         network = self
         altauthlines = []
         altauthlines = []
         bridgelines = []
         bridgelines = []
         builders = [n.getBuilder() for n in self._nodes]
         builders = [n.getBuilder() for n in self._nodes]
-
         self._checkConfig()
         self._checkConfig()
 
 
         # XXX don't change node names or types or count if anything is
         # XXX don't change node names or types or count if anything is