Merge branch 'master' into unstable

This commit is contained in:
Julien Duponchelle committed 2015-08-26 14:36:55 +02:00
commit 8085080e41
2 files changed
+2 -1

No files matched your search

@@ -373,6 +373,7 @@ class Router(BaseVM):
files += glob.glob(os.path.join(project_dir, "{}_i{}_slot[0-1]".format(self.platform, self.dynamips_id)))
files += glob.glob(os.path.join(project_dir, "{}_i{}_nvram".format(self.platform, self.dynamips_id)))
files += glob.glob(os.path.join(project_dir, "{}_i{}_flash[0-1]".format(self.platform, self.dynamips_id)))
files += glob.glob(os.path.join(project_dir, "{}_i{}_rom".format(self.platform, self.dynamips_id)))
for file in files:
try:
log.debug("Deleting file {}".format(file))