mirror of
https://github.com/GNS3/gns3-server.git
synced 2024-12-18 20:37:57 +00:00
Remove .gns3 from folder name.
This commit is contained in:
parent
13f469f9d6
commit
879362d09f
@ -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__
|
||||
|
@ -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
|
||||
|
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user