[Piuparts-commits] [piuparts] 02/02: pre_distupgrade_exceptions: work around /etc/{open=>libre}office/sofficerc migration failure

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit 2770a7949f8478b81bd574e7ce9d98c0d6e310f8
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Apr 29 17:47:38 2017 +0200

    pre_distupgrade_exceptions: work around /etc/{open=>libre}office/sofficerc migration failure
    
    * migration did not work properly while upgrading from squeeze to wheezy
    * gets messed up further while upgrading from wheezy to jessie,
    * eventually leading to #825650 while upgrading from jessie to stretch
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts/pre_distupgrade_exceptions | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/custom-scripts/scripts/pre_distupgrade_exceptions b/custom-scripts/scripts/pre_distupgrade_exceptions
index 13b11b6..963dbe3 100755
--- a/custom-scripts/scripts/pre_distupgrade_exceptions
+++ b/custom-scripts/scripts/pre_distupgrade_exceptions
@@ -121,6 +121,22 @@ if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "jessie" ]; then
 			;;
 	esac
 
+	#825650: libreoffice-common: prompting due to modified conffiles which were not modified by the user: /etc/libreoffice/sofficerc
+	# migration did not work properly while upgrading from squeeze to wheezy,
+	# gets messed up further while upgrading from wheezy to jessie,
+	# eventually leading to problems while upgrading from jessie to stretch
+	if is_installed openoffice.org-common; then
+		if [ -f /etc/openoffice/sofficerc ] && [ -f /etc/libreoffice/sofficerc ]; then
+			log_debug
+			for file in sofficerc soffice.sh psprint.conf
+			do
+				if [ -f /etc/openoffice/$file ] && [ -f /etc/libreoffice/$file ]; then
+					rm -v /etc/openoffice/$file
+				fi
+			done
+		fi
+	fi
+
 fi
 
 if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "experimental" ]; then

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