[Pkg-samba-maint] [samba] 03/04: Don't fail in postinst when removing old alternatives fails

[Ivo De Decker]

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

idd-guest pushed a commit to branch master
in repository samba.

commit 49e522a4d5ee4d8f75a0c73c823cca415dcabd19
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Mon Dec 9 18:24:53 2013 +0100

    Don't fail in postinst when removing old alternatives fails
---
 debian/changelog                 | 1 +
 debian/samba-common-bin.postinst | 6 +++---
 debian/samba.postinst            | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d29c23..f4b1fc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ samba (2:4.0.13+dfsg-1) UNRELEASED; urgency=low
   * Add empty prerm scripts for samba and samba-common-bin.prerm, to allow
     upgrades from earlier versions with broken prerm script (bug introduced in
     2:4.0.10+dfsg-3)
+  * Don't fail in postinst when removing old alternatives fails.
 
   [ Jelmer Vernooij ]
   * Fix invocations of 'update-alternatives --remove-all'. Closes: #731192
diff --git a/debian/samba-common-bin.postinst b/debian/samba-common-bin.postinst
index 1b5d7a0..786a8ea 100644
--- a/debian/samba-common-bin.postinst
+++ b/debian/samba-common-bin.postinst
@@ -3,9 +3,9 @@
 set -e 
 
 if dpkg --compare-versions "$2" lt-nl 2:4.0.12+dfsg-2~; then
-	update-alternatives --remove-all nmblookup
-	update-alternatives --remove-all net
-	update-alternatives --remove-all testparm
+	update-alternatives --remove-all nmblookup || true
+	update-alternatives --remove-all net || true
+	update-alternatives --remove-all testparm || true
 fi
 
 #DEBHELPER#
diff --git a/debian/samba.postinst b/debian/samba.postinst
index 41d4466..267e530 100644
--- a/debian/samba.postinst
+++ b/debian/samba.postinst
@@ -40,7 +40,7 @@ if dpkg --compare-versions "$2" lt-nl 2:3.6.15-2; then
 fi
 
 if dpkg --compare-versions "$2" lt-nl 2:4.0.12+dfsg-2~; then
-	update-alternatives --remove-all smbstatus
+	update-alternatives --remove-all smbstatus || true
 fi
 
 # add the sambashare group

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