[X2Go-Commits] [x2goserver] 11/13: debian/libx2go-server-db-perl.postrm: only remove files that the package actually created.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit dad7320cb6a5d377d137898a09a2d97f81bb6d2f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jul 27 01:37:04 2018 +0200

    debian/libx2go-server-db-perl.postrm: only remove files that the package actually created.
---
 debian/changelog                     | 1 +
 debian/libx2go-server-db-perl.postrm | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 344ff43..682a773 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -204,6 +204,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
       and better quoting, fix other misc. errors within the scripts.
   * debian/libx2go-server-db-perl.postrm:
     + Remove empty directory on purge if possible.
+    + Only remove files that the package actually created.
   * debian/x2goserver-common.postrm:
     + Only remove files that the package actually owns
       (/etc/x2go/x2gosql/sql).
diff --git a/debian/libx2go-server-db-perl.postrm b/debian/libx2go-server-db-perl.postrm
index be3f563..dca978f 100755
--- a/debian/libx2go-server-db-perl.postrm
+++ b/debian/libx2go-server-db-perl.postrm
@@ -23,9 +23,9 @@ case "${1}" in
 		rm -vf '/var/lib/x2go/x2go_sessions'
 		rm -vf '/etc/x2go/x2gosql/passwords/pgadmin'
 		rm -vf '/etc/x2go/x2gosql/passwords/mysqladmin'
-		rmdir -v --ignore-fail-on-non-empty '/etc/x2go/x2gosql/passwords/mysqladmin'
 
-		rm -Rf '/etc/x2go/sql'
+		[ -d '/etc/x2go/x2gosql/passwords' ] && rmdir -v --ignore-fail-on-non-empty '/etc/x2go/x2gosql/passwords'
+
 		[ -d '/etc/x2go' ] && rmdir --ignore-fail-on-non-empty '/etc/x2go'
 		;;
 	'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear')

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git