1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 01:38:08 +00:00

Merge branch 'master' into unstable

This commit is contained in:
Julien Duponchelle 2015-09-22 13:46:08 +02:00
commit bf0813b4b9

View File

@ -394,7 +394,7 @@ class IOUVM(BaseVM):
except configparser.Error as e: except configparser.Error as e:
raise IOUError("Could not parse iourc file {}: {}".format(self.iourc_path, e)) raise IOUError("Could not parse iourc file {}: {}".format(self.iourc_path, e))
except UnicodeDecodeError as e: except UnicodeDecodeError as e:
raise IOUError("Invalid iourc file {}: {}".format(self.iourc_path, e)) raise IOUError("Non ascii characters in iourc file {}, please remove them: {}".format(self.iourc_path, e))
if "license" not in config: if "license" not in config:
raise IOUError("License section not found in iourc file {}".format(self.iourc_path)) raise IOUError("License section not found in iourc file {}".format(self.iourc_path))
hostname = socket.gethostname() hostname = socket.gethostname()