From ad89e83f850573fe8bf620e4572c1b0f687614a2 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 22 Apr 2017 03:09:38 +0100 Subject: Fix purge failure when /etc/ssh has already somehow been removed (LP: #1682817). --- debian/changelog | 2 ++ debian/openssh-client.postrm | 2 +- debian/openssh-server.postrm | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ee74a80d5..d2d626831 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ openssh (1:7.5p1-3) UNRELEASED; urgency=medium * Fix debian/adjust-openssl-dependencies to account for preferring libssl1.0-dev. * Adjust OpenSSL dependencies for openssh-client-ssh1 too. + * Fix purge failure when /etc/ssh has already somehow been removed + (LP: #1682817). -- Colin Watson Sat, 08 Apr 2017 15:39:13 +0100 diff --git a/debian/openssh-client.postrm b/debian/openssh-client.postrm index 68c354481..12fb3671d 100644 --- a/debian/openssh-client.postrm +++ b/debian/openssh-client.postrm @@ -11,7 +11,7 @@ case $1 in # already been removed at this point. rm -f /etc/ssh/moduli /etc/ssh/primes rm -f /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 - rmdir --ignore-fail-on-non-empty /etc/ssh + [ ! -d /etc/ssh ] || rmdir --ignore-fail-on-non-empty /etc/ssh if which delgroup >/dev/null 2>&1; then delgroup --quiet ssh > /dev/null || true diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm index ff16e5619..4a716f563 100644 --- a/debian/openssh-server.postrm +++ b/debian/openssh-server.postrm @@ -24,7 +24,7 @@ case $1 in ucfr --purge openssh-server /etc/ssh/sshd_config fi rm -f /etc/ssh/sshd_not_to_be_run - rmdir --ignore-fail-on-non-empty /etc/ssh + [ ! -d /etc/ssh ] || rmdir --ignore-fail-on-non-empty /etc/ssh if which deluser >/dev/null 2>&1; then deluser --quiet sshd > /dev/null || true -- cgit v1.2.3