From 4ab9b4acc7676470903d2bd8d13b20e8a93e670b Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 10 Apr 2014 15:04:39 -0600 Subject: [PATCH] Fixes topology loading issue. --- gns3server/modules/iou/__init__.py | 13 +++++++------ gns3server/version.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gns3server/modules/iou/__init__.py b/gns3server/modules/iou/__init__.py index 7cefeed5..9c398c10 100644 --- a/gns3server/modules/iou/__init__.py +++ b/gns3server/modules/iou/__init__.py @@ -200,12 +200,13 @@ class IOU(IModule): self._iouyap = request["iouyap"] log.info("iouyap path set to {}".format(self._iouyap)) - if "working_dir" in request and self._working_dir != request["working_dir"]: - self._working_dir = request["working_dir"] - log.info("this server is local with working directory path to {}".format(self._working_dir)) - for iou_id in self._iou_instances: - iou_instance = self._iou_instances[iou_id] - iou_instance.working_dir = self._working_dir + if "working_dir" in request: + if self._working_dir != request["working_dir"]: + self._working_dir = request["working_dir"] + log.info("this server is local with working directory path to {}".format(self._working_dir)) + for iou_id in self._iou_instances: + iou_instance = self._iou_instances[iou_id] + iou_instance.working_dir = self._working_dir else: self._remote_server = True self._working_dir = os.path.join(self._projects_dir, request["project_name"]) diff --git a/gns3server/version.py b/gns3server/version.py index aea583b5..ab96612e 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,5 +23,5 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "1.0a2.dev1" +__version__ = "1.0a2.dev2" __version_info__ = (1, 0, 0, -99)