From 06a6287dffe453ed12469f3b42b3ac28b8aed7d8 Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 31 Jul 2015 14:37:23 -0600 Subject: [PATCH 1/3] Backport: removes code that deletes IOS router instance files. --- gns3server/modules/dynamips/nodes/router.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/gns3server/modules/dynamips/nodes/router.py b/gns3server/modules/dynamips/nodes/router.py index edc6a55b..07bdba6e 100644 --- a/gns3server/modules/dynamips/nodes/router.py +++ b/gns3server/modules/dynamips/nodes/router.py @@ -186,16 +186,6 @@ class Router(BaseVM): @asyncio.coroutine def create(self): - # delete any previous file with same Dynamips identifier - project_dir = os.path.join(self.project.module_working_directory(self.manager.module_name.lower())) - for file in glob.glob(os.path.join(project_dir, "c[0-9][0-9][0-9][0-9]_i{}_*".format(self._dynamips_id))): - try: - log.debug("Deleting file {}".format(file)) - yield from wait_run_in_executor(os.remove, file) - except OSError as e: - log.warn("Could not delete file {}: {}".format(file, e)) - continue - if not self._hypervisor: module_workdir = self.project.module_working_directory(self.manager.module_name.lower()) self._hypervisor = yield from self.manager.start_new_hypervisor(working_dir=module_workdir) From d942f52f7da446e38a9eb09f97ba0f86ea93df4b Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 3 Aug 2015 18:52:22 +0200 Subject: [PATCH 2/3] 1.3.9 --- CHANGELOG | 4 ++++ gns3server/version.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5382d670..41fbcbba 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ # Change Log +## 1.3.9 03/08/2015 + +* Backport: removes code that deletes IOS router instance files. + ## 1.3.8 27/07/2015 * Catch ProcessLookupError when updating iouyap config. Fixes #255. diff --git a/gns3server/version.py b/gns3server/version.py index 07340beb..93958c1c 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.3.9dev1" -__version_info__ = (1, 3, 9, -99) +__version__ = "1.3.9" +__version_info__ = (1, 3, 9, 0) From 39c1d2d2dd79c5b9759c5d2d2a6bfe76a7d494ba Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 3 Aug 2015 19:25:56 +0200 Subject: [PATCH 3/3] Prepare 1.3.10 --- gns3server/crash_report.py | 2 +- gns3server/version.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py index 41a66292..489042b5 100644 --- a/gns3server/crash_report.py +++ b/gns3server/crash_report.py @@ -51,7 +51,7 @@ class CrashReport: Report crash to a third party service """ - DSN = "sync+https://9f469ce68db74d6198ab0f1c2692927d:f9121d079e98421191c88af6d7c14b5e@app.getsentry.com/38482" + DSN = "sync+https://e47fab7019fe4fb3b699609bb9f4fefc:d1d3008a6c8a443ba34f336434c2da34@app.getsentry.com/38482" if hasattr(sys, "frozen"): cacert = os.path.join(os.getcwd(), "cacert.pem") if os.path.isfile(cacert): diff --git a/gns3server/version.py b/gns3server/version.py index 93958c1c..ff1480eb 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.3.9" -__version_info__ = (1, 3, 9, 0) +__version__ = "1.3.10dev1" +__version_info__ = (1, 3, 10, -99)