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

Merge branch '2.2' into fix/3393

Browse Source
This commit is contained in:
Jeremy Grossmann 2022-10-18 22:31:04 +08:00 committed by GitHub
commit 31a490211b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
appveyor.yml
View File

@ -1,6 +1,6 @@
version: '{build}-{branch}' version: '{build}-{branch}'
image: Visual Studio 2015 image: Visual Studio 2022
platform: x64 platform: x64
@ -12,6 +12,7 @@ environment:
install: install:
- cinst nmap - cinst nmap
- "%PYTHON%\\python.exe -m pip install -U pip setuptools" # upgrade pip & setuptools first
- "%PYTHON%\\python.exe -m pip install -r dev-requirements.txt" - "%PYTHON%\\python.exe -m pip install -r dev-requirements.txt"
- "%PYTHON%\\python.exe -m pip install -r win-requirements.txt" - "%PYTHON%\\python.exe -m pip install -r win-requirements.txt"

2
gns3server/crash_report.py
View File

@ -93,7 +93,7 @@ class CrashReport:
"os:release": platform.release(), "os:release": platform.release(),
"os:win_32": " ".join(platform.win32_ver()), "os:win_32": " ".join(platform.win32_ver()),
"os:mac": "{} {}".format(platform.mac_ver()[0], platform.mac_ver()[2]), "os:mac": "{} {}".format(platform.mac_ver()[0], platform.mac_ver()[2]),
"os:linux": " ".join(distro.linux_distribution()), "os:linux": distro.name(pretty=True),
} }