arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity

Remove .gns3 from folder name.

Browse Source
This commit is contained in:
grossmj 2014-05-09 11:19:07 -06:00
parent 13f469f9d6
commit 879362d09f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@ -4,7 +4,7 @@ include INSTALL
include LICENSE include LICENSE
include MANIFEST.in include MANIFEST.in
include tox.ini include tox.ini
recursive-include tests * recursive-exclude tests *
recursive-include docs * recursive-include docs *
recursive-include gns3server * recursive-include gns3server *
recursive-exclude * __pycache__ recursive-exclude * __pycache__

4
gns3server/modules/dynamips/__init__.py
View File

@ -285,14 +285,14 @@ class Dynamips(IModule):
self._working_dir = request.pop("working_dir") self._working_dir = request.pop("working_dir")
log.info("this server is local") log.info("this server is local")
else: 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)) log.info("this server is remote with working directory path to {}".format(self._working_dir))
self._hypervisor_manager_settings = request self._hypervisor_manager_settings = request
else: else:
if "project_name" in request: 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: if self._projects_dir != self._working_dir != new_working_dir:
# trick to avoid file locks by Dynamips on Windows # trick to avoid file locks by Dynamips on Windows

2
gns3server/modules/iou/__init__.py
View File

@ -230,7 +230,7 @@ class IOU(IModule):
new_working_dir = request["working_dir"] new_working_dir = request["working_dir"]
log.info("this server is local with working directory path to {}".format(new_working_dir)) log.info("this server is local with working directory path to {}".format(new_working_dir))
else: 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)) 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 self._projects_dir != self._working_dir != new_working_dir:
if not os.path.isdir(new_working_dir): if not os.path.isdir(new_working_dir):