From 0fa4609220bec097619455945f1cb15ab28b69a4 Mon Sep 17 00:00:00 2001 From: Khushboo Vashi Date: Mon, 14 Feb 2022 17:26:27 +0530 Subject: [PATCH] 1) Fixed API test cases for Utilities. 2) Try to fix Jenkins build for __pycache__. --- pkg/debian/build.sh | 3 +++ pkg/redhat/build.sh | 3 +++ web/pgadmin/misc/bgprocess/processes.py | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/debian/build.sh b/pkg/debian/build.sh index 8bccbc8aa..717800362 100755 --- a/pkg/debian/build.sh +++ b/pkg/debian/build.sh @@ -10,6 +10,9 @@ OS_VERSION=$(cat /etc/os-release | grep "^VERSION_ID=" | awk -F "=" '{ print $2 OS_NAME=$(cat /etc/os-release | grep "^ID=" | awk -F "=" '{ print $2 }' | sed 's/"//g') OS_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) +# Stop creating pyc files. +export PYTHONDONTWRITEBYTECODE=1 + # Common Linux build functions source pkg/linux/build-functions.sh diff --git a/pkg/redhat/build.sh b/pkg/redhat/build.sh index 0547fd289..2de1dfb71 100755 --- a/pkg/redhat/build.sh +++ b/pkg/redhat/build.sh @@ -13,6 +13,9 @@ OS_ARCH=$(arch) # Make sure we get the right libpq export PATH=/usr/pgsql-14/bin:$PATH +# Stop creating pyc files. +export PYTHONDONTWRITEBYTECODE=1 + # Common Linux build functions source pkg/linux/build-functions.sh diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py index 4fa8cbcce..bc88abbf3 100644 --- a/web/pgadmin/misc/bgprocess/processes.py +++ b/web/pgadmin/misc/bgprocess/processes.py @@ -528,7 +528,7 @@ class BatchProcess(object): cloud_instance['instance']['sid'] = _process.server_id cloud_instance['instance']['status'] = False return update_server(cloud_instance) - return False, None + return True, {} def status(self, out=0, err=0): ctime = get_current_time(format='%y%m%d%H%M%S%f')