Merge branch 'master' into unstable

This commit is contained in:
Julien Duponchelle committed 2015-05-14 19:29:30 +02:00
commit 743187bb2e
8 files changed
+90 -27

No files matched your search

+6 -3
View File
@@ -433,11 +433,14 @@ class IOUVM(BaseVM):
yield from self._library_check()
self._rename_nvram_file()
try:
self._rename_nvram_file()
except OSError as e:
raise IOUError("Could not rename nvram files: {}".format(e))
iourc_path = self.iourc_path
if iourc_path is None:
raise IOUError("Could not find a iourc file (IOU license)")
if not iourc_path:
raise IOUError("Could not find an iourc file (IOU license)")
if not os.path.isfile(iourc_path):
raise IOUError("The iourc path '{}' is not a regular file".format(iourc_path))