From 1d3e0a4455eba89fd03e8c9fe7be7f1985efe214 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Thu, 27 Mar 2025 12:32:25 +0530 Subject: [PATCH] Revert the fix for #8006 --- docs/en_US/release_notes_9_2.rst | 1 - pkg/redhat/build.sh | 6 ++++++ web/pgadmin/tools/psql/__init__.py | 3 +-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/en_US/release_notes_9_2.rst b/docs/en_US/release_notes_9_2.rst index 108e00f90..d5f7035ff 100644 --- a/docs/en_US/release_notes_9_2.rst +++ b/docs/en_US/release_notes_9_2.rst @@ -37,7 +37,6 @@ Housekeeping Bug fixes ********* - | `Issue #8006 `_ - Removed the pre-install script from the Red Hat build function as it was causing a No such file or directory warning during the update. | `Issue #8316 `_ - Ensure that modal dialogs are not triggered more than once to avoid duplicates. | `Issue #8355 `_ - Change session files garbage collection strategy. | `Issue #8362 `_ - Fixed an issue where pgAdmin should fallback to main screen if the last opened screen is disconnected. diff --git a/pkg/redhat/build.sh b/pkg/redhat/build.sh index 9b8666f4d..b78dcc5d6 100755 --- a/pkg/redhat/build.sh +++ b/pkg/redhat/build.sh @@ -68,6 +68,12 @@ Requires: ${PYTHON_BINARY}, libpq5, krb5-libs %description The core server package for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world. +%pre +rm -rf /usr/pgadmin4/venv +if [ -d /usr/pgadmin4/web ]; then + cd /usr/pgadmin4/web && rm -rf \$(ls -A -I config_local.py) +fi + %build %install diff --git a/web/pgadmin/tools/psql/__init__.py b/web/pgadmin/tools/psql/__init__.py index feb20440d..d15d4a596 100644 --- a/web/pgadmin/tools/psql/__init__.py +++ b/web/pgadmin/tools/psql/__init__.py @@ -274,8 +274,7 @@ def non_windows_platform(parent, p, fd, data, max_read_bytes, sid): except OSError as e: # If the process is killed, bad file descriptor exception may # occur. Handle it gracefully - if p.poll() is not None: - raise e + pass def pty_handel_io(connection_data, data, sid):