From a613da069ef5eba676c70d90355b015fcd3ae486 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sat, 25 Mar 2023 19:45:05 -0700 Subject: [PATCH] server: relax failure on python arch mismatch --- server/package-lock.json | 4 ++-- server/python/plugin_remote.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index 157b2a076..dd466d406 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.7.29", + "version": "0.7.31", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.7.29", + "version": "0.7.31", "license": "ISC", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.10", diff --git a/server/python/plugin_remote.py b/server/python/plugin_remote.py index f230a3a7a..6301eaa79 100644 --- a/server/python/plugin_remote.py +++ b/server/python/plugin_remote.py @@ -374,12 +374,13 @@ class PluginRemote: # to fail because pip only allows filtering on machine, even if running a different architeture. # this will cause prebuilt wheel installation to fail. if platform.machine() == 'aarch64' and platform.architecture()[0] == '32bit': - print('Python machine vs architecture mismatch detected.') + print('=============================================') + print('Python machine vs architecture mismatch detected. Plugin installation may fail.') print('If Scrypted is running in docker, the docker version may be 32bit while the host kernel is 64bit.') print('This may be resolved by reinstalling a 64bit docker.') print('The docker architecture can be checked with the command: "file $(which docker)"') print('The host architecture can be checked with: "uname -m"') - raise Exception('Python machine/architecture mismatch') + print('=============================================') python_version = 'python%s' % str( sys.version_info[0])+"."+str(sys.version_info[1])