NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-06 07:11:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use SubprocessError to catch Subprocess exceptions.

Browse Source
This commit is contained in:
Jeremy committed 2014-11-22 17:45:04 -07:00
1 parent 3bd88178a0
commit 09948a366f
7 files changed
+14 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/modules/qemu/__init__.py
+1 -1
View File
@@ -608,7 +608,7 @@ class Qemu(IModule):
return version
else:
raise QemuError("Could not determine the Qemu version for {}".format(qemu_path))
except (OSError, subprocess.CalledProcessError) as e:
except subprocess.SubprocessError as e:
raise QemuError("Error while looking for the Qemu version: {}".format(e))
@IModule.route("qemu.qemu_list")
gns3server/modules/qemu/qemu_vm.py
+3 -3
View File
@@ -612,7 +612,7 @@ class QemuVM(object):
cwd=self._working_dir)
log.info("QEMU VM instance {} started PID={}".format(self._id, self._process.pid))
self._started = True
except OSError as e:
except subprocess.SubprocessError as e:
stdout = self.read_stdout()
log.error("could not start QEMU {}: {}\n{}".format(self._qemu_path, e, stdout))
raise QemuError("could not start QEMU {}: {}\n{}".format(self._qemu_path, e, stdout))
@@ -782,7 +782,7 @@ class QemuVM(object):
retcode = subprocess.call([qemu_img_path, "create", "-f", "qcow2", hda_disk, "128M"])
log.info("{} returned with {}".format(qemu_img_path, retcode))
except OSError as e:
except subprocess.SubprocessError as e:
raise QemuError("Could not create disk image {}".format(e))
options.extend(["-hda", hda_disk])
@@ -794,7 +794,7 @@ class QemuVM(object):
"backing_file={}".format(self._hdb_disk_image),
"-f", "qcow2", hdb_disk])
log.info("{} returned with {}".format(qemu_img_path, retcode))
except OSError as e:
except subprocess.SubprocessError as e:
raise QemuError("Could not create disk image {}".format(e))
options.extend(["-hdb", hdb_disk])