[X2Go-Commits] [x2goserver] 01/01: debian/{libx2go-server-db-perl, x2goserver{, -common}}.postrm: do not try to run rmdir on /etc/x2go if it doesn't exist.

git-admin at x2go.org git-admin at x2go.org
Wed Mar 14 14:58:50 CET 2018


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

x2go pushed a commit to branch master
in repository x2goserver.

commit 561ee44138fa6bc02d1293539dac501a9dda1886
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Mar 14 14:57:19 2018 +0100

    debian/{libx2go-server-db-perl,x2goserver{,-common}}.postrm: do not try to run rmdir on /etc/x2go if it doesn't exist.
    
    Makes the scriptlet (and thus the purge operation) fail...
---
 debian/changelog                     | 3 +++
 debian/libx2go-server-db-perl.postrm | 2 +-
 debian/x2goserver-common.postrm      | 2 +-
 debian/x2goserver.postrm             | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f99fe8..7602096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -175,6 +175,9 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
       /usr/lib/tmpfiles.d/ gracefully.
   * debian/libx2go-server-db-perl.post{inst,rm}:
     + Add support for mysqladmin password file.
+  * debian/{libx2go-server-db-perl,x2goserver{,-common}}.postrm:
+    + Do not try to run rmdir on /etc/x2go if it doesn't exist. Makes the
+      scriptlet (and thus the purge operation) fail...
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 15 Feb 2018 23:14:28 +0100
 
diff --git a/debian/libx2go-server-db-perl.postrm b/debian/libx2go-server-db-perl.postrm
index 91afa7b..2cf62c0 100755
--- a/debian/libx2go-server-db-perl.postrm
+++ b/debian/libx2go-server-db-perl.postrm
@@ -25,7 +25,7 @@ case "$1" in
 		rm -vf /etc/x2go/x2gosql/passwords/mysqladmin
 
 		rm -Rf /etc/x2go/sql
-		rmdir --ignore-fail-on-non-empty /etc/x2go
+		[ -d '/etc/x2go' ] && rmdir --ignore-fail-on-non-empty /etc/x2go
 
 		;;
 	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/x2goserver-common.postrm b/debian/x2goserver-common.postrm
index c51a05d..7b020f9 100755
--- a/debian/x2goserver-common.postrm
+++ b/debian/x2goserver-common.postrm
@@ -24,7 +24,7 @@ case "${1}" in
 		getent 'group' 'x2gouser' >'/dev/null' && delgroup 'x2gouser'
 		getent 'group' 'x2gousers' >'/dev/null' && delgroup 'x2gousers'
 
-		rmdir --ignore-fail-on-non-empty '/etc/x2go'
+		[ -d '/etc/x2go' ] && rmdir --ignore-fail-on-non-empty '/etc/x2go'
 		;;
 	'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear')
 		;;
diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm
index 32f6646..3bf0d0f 100755
--- a/debian/x2goserver.postrm
+++ b/debian/x2goserver.postrm
@@ -24,7 +24,7 @@ case "${1}" in
 
 		rm -Rf '/etc/x2go/applications'
 		rm -Rf '/etc/x2go/x2go_logout.d'
-		rmdir --ignore-fail-on-non-empty '/etc/x2go'
+		[ -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


More information about the x2go-commits mailing list