NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 05:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2' into 3.0

Browse Source 
# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/crash_report.py
#	gns3server/handlers/api/controller/node_handler.py
#	gns3server/utils/images.py
This commit is contained in:
grossmj committed 2023-08-02 18:26:50 +10:00
2 parents 46b8ee3279 c51d71a4fa
commit 1d59afa9fb
3 files changed
+13 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/controller/__init__.py
+1 -1
View File
@@ -291,7 +291,7 @@ class Controller:
log.error(f"Cannot read Etag appliance file '{etag_appliances_path}': {e}")
# FIXME install builtin appliances only once, need to store "version" somewhere...
#if parse_version(__version__) > parse_version(controller_settings.get("version", "")):
#if parse_version(__version__.split("+")[0]) > parse_version(controller_settings.get("version", "")):
# self._appliance_manager.install_builtin_appliances()
self._appliance_manager.install_builtin_appliances()