From 6b31fc45524f202d66b0b079d9a9e5bb1f0626aa Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Mon, 10 Apr 2023 16:56:38 +0530
Subject: [PATCH] Change the logic to prevent the config_local.py from deletion
 on RPM and Debian.

---
 docs/en_US/release_notes_7_0.rst | 6 ++++--
 pkg/debian/build.sh              | 6 +++++-
 pkg/redhat/build.sh              | 6 +++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/en_US/release_notes_7_0.rst b/docs/en_US/release_notes_7_0.rst
index 209f8f04d..63bb4a597 100644
--- a/docs/en_US/release_notes_7_0.rst
+++ b/docs/en_US/release_notes_7_0.rst
@@ -2,7 +2,7 @@
 Version 7.0
 ***********
 
-Release date: 2023-04-11
+Release date: 2023-04-13
 
 This release contains a number of bug fixes and new features since the release of pgAdmin 4 v6.21.
 
@@ -14,7 +14,7 @@ Supported Database Servers
 
 Bundled PostgreSQL Utilities
 ****************************
-**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 15.1
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 15.2
 
 
 New features
@@ -67,4 +67,6 @@ Bug fixes
   | `Issue #5958 <https://github.com/pgadmin-org/pgadmin4/issues/5958>`_ -  Fix an issue where new dashboard graphs are partially following theme colors.
   | `Issue #5959 <https://github.com/pgadmin-org/pgadmin4/issues/5959>`_ -  Fix an issue where Backup, Restore, and Maintenance not working if connection timeout is set in the server dialog.
   | `Issue #6018 <https://github.com/pgadmin-org/pgadmin4/issues/6018>`_ -  Change the foreground color of the code mirror text for Dark Theme.
+  | `Issue #6093 <https://github.com/pgadmin-org/pgadmin4/issues/6093>`_ -  Fix the dependents SQL of Roles which is throwing a type casting error on PostgreSQL 15.
   | `Issue #6100 <https://github.com/pgadmin-org/pgadmin4/issues/6100>`_ -  Fixed the LDAP authentication issue for the simultaneous login attempts.(CVE-2023-1907)
+  | `Issue #6109 <https://github.com/pgadmin-org/pgadmin4/issues/6109>`_ -  Fixed asyncio random task error messages in Query tool.
diff --git a/pkg/debian/build.sh b/pkg/debian/build.sh
index ad58ca058..859e7df88 100755
--- a/pkg/debian/build.sh
+++ b/pkg/debian/build.sh
@@ -37,7 +37,11 @@ cat << EOF > "${SERVERROOT}/DEBIAN/preinst"
 
 rm -rf /usr/pgadmin4/venv
 if [ -d /usr/pgadmin4/web ]; then
-    cd /usr/pgadmin4/web && rm -rf $(ls -A -I config_local.py)
+  for f in /usr/pgadmin4/web/*; do
+    if [ "$f" != "/usr/pgadmin4/web/config_local.py" ]; then
+      rm -rf $f
+    fi
+  done
 fi
 EOF
 
diff --git a/pkg/redhat/build.sh b/pkg/redhat/build.sh
index 32c1e7113..7b2ca7da7 100755
--- a/pkg/redhat/build.sh
+++ b/pkg/redhat/build.sh
@@ -70,7 +70,11 @@ The core server package for pgAdmin. pgAdmin is the most popular and feature ric
 %pre
 rm -rf /usr/pgadmin4/venv
 if [ -d /usr/pgadmin4/web ]; then
-    cd /usr/pgadmin4/web && rm -rf $(ls -A -I config_local.py)
+  for f in /usr/pgadmin4/web/*; do
+    if [ "$f" != "/usr/pgadmin4/web/config_local.py" ]; then
+      rm -rf $f
+    fi
+  done
 fi
 
 %build