Skip to content

Fix printing windows version #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 28, 2024
Merged

Fix printing windows version #179

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
beb5141
Fix printing windows version
s-cu-bot Aug 10, 2024
b0c8a76
Fix printing windows version
s-cu-bot Aug 25, 2024
7cf0318
Fix printing windows version
s-cu-bot Aug 25, 2024
511c9f9
Fix printing windows version
s-cu-bot Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/fosslight_util/set_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,21 @@ def init_check_latest_version(pkg_version="", main_package_name=""):
logger.debug('Cannot check the latest version:' + str(error))


def get_os_version():

logger = logging.getLogger(constant.LOGGER_NAME)

os_version = platform.system() + " " + platform.release()
if os_version == "Windows 10":
try:
windows_build = sys.getwindowsversion().build
if windows_build >= 22000:
os_version = "Windows 11"
except Exception as error:
logger.debug(str(error))
return os_version


class CustomAdapter(logging.LoggerAdapter):
def __init__(self, logger, extra):
super(CustomAdapter, self).__init__(logger, {})
Expand Down Expand Up @@ -70,7 +85,7 @@ def init_log(log_file, create_file=True, stream_log_level=logging.INFO,
_result_log = {
"Tool Info": main_package_name,
"Python version": _PYTHON_VERSION,
"OS": platform.system()+" "+platform.release(),
"OS": get_os_version(),
}
if main_package_name != "":
pkg_info = main_package_name
Expand Down