From beb51416857e391bbade59e656d4aaa04ebb1c10 Mon Sep 17 00:00:00 2001 From: s-cu-bot Date: Sat, 10 Aug 2024 15:01:54 +0900 Subject: [PATCH 1/4] Fix printing windows version --- src/fosslight_util/set_log.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/fosslight_util/set_log.py b/src/fosslight_util/set_log.py index d61e52a..4b3c4fd 100755 --- a/src/fosslight_util/set_log.py +++ b/src/fosslight_util/set_log.py @@ -31,6 +31,17 @@ def init_check_latest_version(pkg_version="", main_package_name=""): except Exception as error: logger.debug('Cannot check the latest version:' + str(error)) +def get_os_version() : + 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 e : + pass + + return os_version class CustomAdapter(logging.LoggerAdapter): def __init__(self, logger, extra): @@ -70,7 +81,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 From b0c8a760f0ee5fb6235091ce885c9d98f07f9ded Mon Sep 17 00:00:00 2001 From: s-cu-bot Date: Sun, 25 Aug 2024 15:59:39 +0900 Subject: [PATCH 2/4] Fix printing windows version Signed-off-by: s-cu-bot --- src/fosslight_util/set_log.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/fosslight_util/set_log.py b/src/fosslight_util/set_log.py index 4b3c4fd..d4802f3 100755 --- a/src/fosslight_util/set_log.py +++ b/src/fosslight_util/set_log.py @@ -31,18 +31,18 @@ def init_check_latest_version(pkg_version="", main_package_name=""): except Exception as error: logger.debug('Cannot check the latest version:' + str(error)) -def get_os_version() : +def get_os_version(): os_version = platform.system() + " " + platform.release() - if os_version == "Windows 10" : - try : + if os_version == "Windows 10": + try: windows_build = sys.getwindowsversion().build - if windows_build >= 22000 : + if windows_build >= 22000: os_version = "Windows 11" - except Exception as e : + except: pass - return os_version + class CustomAdapter(logging.LoggerAdapter): def __init__(self, logger, extra): super(CustomAdapter, self).__init__(logger, {}) @@ -97,4 +97,4 @@ def init_log(log_file, create_file=True, stream_log_level=logging.INFO, if path_to_exclude != []: _result_log["Path to exclude"] = ", ".join(path_to_exclude) - return logger, _result_log + return logger, _result_log \ No newline at end of file From 7cf03180ef841073439c621ee4aa49b13abc5430 Mon Sep 17 00:00:00 2001 From: s-cu-bot Date: Sun, 25 Aug 2024 16:33:22 +0900 Subject: [PATCH 3/4] Fix printing windows version Signed-off-by: s-cu-bot --- src/fosslight_util/set_log.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/fosslight_util/set_log.py b/src/fosslight_util/set_log.py index d4802f3..ff683f4 100755 --- a/src/fosslight_util/set_log.py +++ b/src/fosslight_util/set_log.py @@ -31,15 +31,19 @@ def init_check_latest_version(pkg_version="", main_package_name=""): except Exception as error: 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: - pass + except Exception as error: + logger.debug(str(error)) return os_version From 511c9f914c852324a228533fb526793698db701f Mon Sep 17 00:00:00 2001 From: s-cu-bot Date: Sun, 25 Aug 2024 17:05:53 +0900 Subject: [PATCH 4/4] Fix printing windows version Signed-off-by: s-cu-bot --- src/fosslight_util/set_log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fosslight_util/set_log.py b/src/fosslight_util/set_log.py index ff683f4..0b5b2c5 100755 --- a/src/fosslight_util/set_log.py +++ b/src/fosslight_util/set_log.py @@ -101,4 +101,4 @@ def init_log(log_file, create_file=True, stream_log_level=logging.INFO, if path_to_exclude != []: _result_log["Path to exclude"] = ", ".join(path_to_exclude) - return logger, _result_log \ No newline at end of file + return logger, _result_log