From 879362d09ff72c67c94fb4294debe247d342b949 Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 9 May 2014 11:19:07 -0600 Subject: [PATCH] Remove .gns3 from folder name. --- MANIFEST.in | 2 +- gns3server/modules/dynamips/__init__.py | 4 ++-- gns3server/modules/iou/__init__.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 75d25e8a..de23a6da 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,7 +4,7 @@ include INSTALL include LICENSE include MANIFEST.in include tox.ini -recursive-include tests * +recursive-exclude tests * recursive-include docs * recursive-include gns3server * recursive-exclude * __pycache__ diff --git a/gns3server/modules/dynamips/__init__.py b/gns3server/modules/dynamips/__init__.py index 4a8224ef..62ea82c6 100644 --- a/gns3server/modules/dynamips/__init__.py +++ b/gns3server/modules/dynamips/__init__.py @@ -285,14 +285,14 @@ class Dynamips(IModule): self._working_dir = request.pop("working_dir") log.info("this server is local") else: - self._working_dir = os.path.join(self._projects_dir, request["project_name"] + ".gns3") + self._working_dir = os.path.join(self._projects_dir, request["project_name"]) log.info("this server is remote with working directory path to {}".format(self._working_dir)) self._hypervisor_manager_settings = request else: if "project_name" in request: - new_working_dir = os.path.join(self._projects_dir, request["project_name"] + ".gns3") + new_working_dir = os.path.join(self._projects_dir, request["project_name"]) if self._projects_dir != self._working_dir != new_working_dir: # trick to avoid file locks by Dynamips on Windows diff --git a/gns3server/modules/iou/__init__.py b/gns3server/modules/iou/__init__.py index 334ba4a9..bf13e665 100644 --- a/gns3server/modules/iou/__init__.py +++ b/gns3server/modules/iou/__init__.py @@ -230,7 +230,7 @@ class IOU(IModule): new_working_dir = request["working_dir"] log.info("this server is local with working directory path to {}".format(new_working_dir)) else: - new_working_dir = os.path.join(self._projects_dir, request["project_name"] + ".gns3") + new_working_dir = os.path.join(self._projects_dir, request["project_name"]) log.info("this server is remote with working directory path to {}".format(new_working_dir)) if self._projects_dir != self._working_dir != new_working_dir: if not os.path.isdir(new_working_dir):