arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-11 16:41:04 +00:00
Code Issues Releases Wiki Activity

Do not fail a Dynamips project conversion if a file being used.

Browse Source
This commit is contained in:
grossmj 2018-04-16 15:45:43 +08:00
parent a12c5a95b0
commit 5c4f6dd3dc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/compute/dynamips/nodes/router.py
View File

@ -131,14 +131,16 @@ class Router(BaseNode):
try: try:
shutil.move(path, dst) shutil.move(path, dst)
except OSError as e: except OSError as e:
raise DynamipsError("Can't move {}: {}".format(path, str(e))) log.error("Can't move {}: {}".format(path, str(e)))
continue
for path in glob.glob(os.path.join(glob.escape(dynamips_dir), "*_i{}_*".format(dynamips_id))): for path in glob.glob(os.path.join(glob.escape(dynamips_dir), "*_i{}_*".format(dynamips_id))):
dst = os.path.join(self._working_directory, os.path.basename(path)) dst = os.path.join(self._working_directory, os.path.basename(path))
if not os.path.exists(dst): if not os.path.exists(dst):
try: try:
shutil.move(path, dst) shutil.move(path, dst)
except OSError as e: except OSError as e:
raise DynamipsError("Can't move {}: {}".format(path, str(e))) log.error("Can't move {}: {}".format(path, str(e)))
continue
def __json__(self): def __json__(self):