forked from pool/pgadmin4
Antonio Larrosa
dc38b702ad
- Fix shebang of pgadmin4-desktop to use python3.11 - New pgadmin4-cloud subpackage that includes now the cloud dependencies and make the pgadmin4-cloud package optional so it's now optional to depend on the azure/aws/google python packages. - Add patch to let pgadmin4 work without cloud support: * make-cloud-packages-optional.patch - Add a optipng script that actually uses pngcrush to compress png images so we don't depend on optipng which is not available in SLE. - Fix pgadmin4-desktop to use a timer instead of threads. It seems there's an issue the way python threads were used with Qt5 that made the script fail to update the systray menu when pgadmin was started. - Add missing python-typer dependency - Add pgadmin4-user.conf file to create the pgadmin user/group using systemd with the new system-user-pgadmin package. - Replace yarn (which is not available in SLE) with local-npm-registry. - Add node_modules service and node_modules.obscpio / node_modules.spec.inc source files which replace vendor.tar.xz that is now removed. - package_deps.patch - dependency fixes - package_git_local.patch - dependency fixes that are needed *after* generating package-lock.json since only registry-supplied packages are available locally. - Update update-vendor.sh script. OBS-URL: https://build.opensuse.org/request/show/1145351 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/pgadmin4?expand=0&rev=65
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
Index: pgadmin4-8.2/web/pgadmin/misc/__init__.py
|
|
===================================================================
|
|
--- pgadmin4-8.2.orig/web/pgadmin/misc/__init__.py
|
|
+++ pgadmin4-8.2/web/pgadmin/misc/__init__.py
|
|
@@ -108,8 +108,17 @@ class MiscModule(PgAdminModule):
|
|
from .bgprocess import blueprint as module
|
|
self.submodules.append(module)
|
|
|
|
- from .cloud import blueprint as module
|
|
- self.submodules.append(module)
|
|
+ try:
|
|
+ from .cloud import blueprint as module
|
|
+ self.submodules.append(module)
|
|
+ except ModuleNotFoundError:
|
|
+ print('\n\n')
|
|
+ print('###########################################################\n')
|
|
+ print(' IMPORTANT WARNING:\n')
|
|
+ print('Cloud packages not found, if you want to enable cloud support,')
|
|
+ print('please install the pgadmin4-cloud package')
|
|
+ print('\n###########################################################\n')
|
|
+
|
|
|
|
from .dependencies import blueprint as module
|
|
self.submodules.append(module)
|