From 990c0e07cf9207a04488d3f8d078838ce23ebb1f Mon Sep 17 00:00:00 2001 From: Safihre Date: Fri, 14 May 2021 09:08:37 +0200 Subject: [PATCH] platform.platform() is not available on all platforms Closes #1893 --- SABnzbd.py | 12 +++++++++--- sabnzbd/utils/getperformance.py | 8 ++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/SABnzbd.py b/SABnzbd.py index ca17b4a..3f9ded6 100755 --- a/SABnzbd.py +++ b/SABnzbd.py @@ -1169,12 +1169,18 @@ def main(): except: pass logging.info("Commit = %s", sabnzbd.__baseline__) + logging.info("Full executable path = %s", sabnzbd.MY_FULLNAME) - logging.info("Platform = %s - %s", os.name, platform.platform()) - logging.info("CPU architecture = %s", cpu_architecture) - logging.info("Python-version = %s", sys.version) logging.info("Arguments = %s", sabnzbd.CMDLINE) + logging.info("Python-version = %s", sys.version) logging.info("Dockerized = %s", sabnzbd.DOCKER) + logging.info("CPU architecture = %s", cpu_architecture) + + try: + logging.info("Platform = %s - %s", os.name, platform.platform()) + except: + # Can fail on special platforms (like Snapcraft or embedded) + pass # Find encoding; relevant for external processing activities logging.info("Preferred encoding = %s", sabnzbd.encoding.CODEPAGE) diff --git a/sabnzbd/utils/getperformance.py b/sabnzbd/utils/getperformance.py index 583ae2e..a0d43ed 100644 --- a/sabnzbd/utils/getperformance.py +++ b/sabnzbd/utils/getperformance.py @@ -38,8 +38,12 @@ def getcpu(): # OK, found. Remove unwanted spaces: cputype = " ".join(cputype.split()) else: - # Not found, so let's fall back to platform() - cputype = platform.platform() + try: + # Not found, so let's fall back to platform() + cputype = platform.platform() + except: + # Can fail on special platforms (like Snapcraft or embedded) + pass return cputype