[X2Go-Commits] [x2goserver] 10/13: debian/x2goserver-common.postrm: only remove files that the package actually owns (/etc/x2go/x2gosql/sql).

[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 88e90d640039f2128df7e2cd3accc6389963eea6
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jul 27 01:31:06 2018 +0200

    debian/x2goserver-common.postrm: only remove files that the package actually owns (/etc/x2go/x2gosql/sql).
---
 debian/changelog                | 3 +++
 debian/x2goserver-common.postrm | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 14eca24..344ff43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -204,6 +204,9 @@ 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.
+  * debian/x2goserver-common.postrm:
+    + Only remove files that the package actually owns
+      (/etc/x2go/x2gosql/sql).
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 15 Feb 2018 23:14:28 +0100
 
diff --git a/debian/x2goserver-common.postrm b/debian/x2goserver-common.postrm
index 3d90471..23a245c 100755
--- a/debian/x2goserver-common.postrm
+++ b/debian/x2goserver-common.postrm
@@ -28,9 +28,12 @@ case "${1}" in
 		getent 'group' 'x2gousers' >'/dev/null' && delgroup 'x2gousers'
 
 		rm -vf '/etc/x2go/x2goserver.conf'
-		rm -Rf '/etc/x2go/x2gosql/'
 		rm -Rf '/var/lib/x2go/'
 
+		rm -f '/etc/x2go/x2gosql/sql'
+
+		[ -d '/etc/x2go/x2gosql' ] && rmdir --ignore-fail-on-non-empty '/etc/x2go/x2gosql'
+
 		[ -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