1
0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-23 06:20:59 +00:00

Merge branch 'master' into unstable

This commit is contained in:
Julien Duponchelle 2015-09-22 14:40:13 +02:00
commit e7ea9e8047

View File

@ -338,8 +338,6 @@ class Router(BaseVM):
return
log.debug('Router "{name}" [{id}] is closing'.format(name=self._name, id=self._id))
if self._dynamips_id in self._dynamips_ids[self._project.id]:
self._dynamips_ids[self._project.id].remove(self._dynamips_id)
if self._console:
self._manager.port_manager.release_tcp_port(self._console, self._project)
@ -1628,6 +1626,9 @@ class Router(BaseVM):
log.warn("Could not delete file {}: {}".format(file, e))
continue
if self._dynamips_id in self._dynamips_ids[self._project.id]:
self._dynamips_ids[self._project.id].remove(self._dynamips_id)
@asyncio.coroutine
def clean_delete(self):
"""