[pkg-remote-commits] [xrdp] 02/07: This part actually suffices.

[Thorsten Glaser]

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

tg pushed a commit to branch master
in repository xrdp.

commit a39783ef0e7c731bd36b7d3023dc9a6fbe568971
Author: mirabilos <t.glaser at tarent.de>
Date:   Wed Jan 25 11:28:46 2017 +0100

    This part actually suffices.
---
 debian/xrdp.preinst | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/xrdp.preinst b/debian/xrdp.preinst
index 9e73768..182d0d0 100644
--- a/debian/xrdp.preinst
+++ b/debian/xrdp.preinst
@@ -33,12 +33,6 @@ esac
 
 # fixup conffiles after dpkg-maintscript-helper has run, for
 # upgrades from jessie and older jessie-backports
-if test -h /etc/pam.d/xrdp-sesman; then
-	rm -f /etc/pam.d/xrdp-sesman
-	if test -e /etc/pam.d/xrdp-sesman.dpkg-new; then
-		echo >&2 I: moving old xrdp PAM configuration file
-		mv -f /etc/pam.d/xrdp-sesman.dpkg-new /etc/pam.d/xrdp-sesman
-	fi
-fi
+(test -h /etc/pam.d/xrdp-sesman && rm -f /etc/pam.d/xrdp-sesman || :)
 
 exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/xrdp.git