NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-17 01:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash if IOU initial config is emtpy

Browse Source 
Fix #147
This commit is contained in:
Julien Duponchelle 2015-04-09 10:27:50 +02:00
parent 202032f334
commit 2d507fd17a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/modules/iou/iou_vm.py
View File

@ -996,6 +996,9 @@ class IOUVM(BaseVM):
try: try:
script_file = os.path.join(self.working_dir, "initial-config.cfg") script_file = os.path.join(self.working_dir, "initial-config.cfg")
if initial_config is None:
initial_config = ''
# We disallow erasing the initial config file # We disallow erasing the initial config file
if len(initial_config) == 0 and os.path.exists(script_file): if len(initial_config) == 0 and os.path.exists(script_file):
return return
@ -1068,7 +1071,6 @@ class IOUVM(BaseVM):
raise IOUError("Packet capture is already activated on {adapter_number}/{port_number}".format(adapter_number=adapter_number, raise IOUError("Packet capture is already activated on {adapter_number}/{port_number}".format(adapter_number=adapter_number,
port_number=port_number)) port_number=port_number))
nio.startPacketCapture(output_file, data_link_type) nio.startPacketCapture(output_file, data_link_type)
log.info('IOU "{name}" [{id}]: starting packet capture on {adapter_number}/{port_number}'.format(name=self._name, log.info('IOU "{name}" [{id}]: starting packet capture on {adapter_number}/{port_number}'.format(name=self._name,
id=self._id, id=self._id,