[Piuparts-commits] [piuparts] 04/04: skip testing usrmerge

[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 ca20cb4df221295e575a907348ce971de18046cb
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Dec 21 02:20:54 2016 +0100

    skip testing usrmerge
    
    performs piuparts-unfriendy filesystem layout changes
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts/is_testable_uninstallable | 3 +++
 custom-scripts/scripts/pre_remove_exceptions     | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/custom-scripts/scripts/is_testable_uninstallable b/custom-scripts/scripts/is_testable_uninstallable
index 4e82dfc..4aced35 100755
--- a/custom-scripts/scripts/is_testable_uninstallable
+++ b/custom-scripts/scripts/is_testable_uninstallable
@@ -71,6 +71,9 @@ case ${PIUPARTS_OBJECTS%%=*}@${PIUPARTS_DISTRIBUTION} in
 	ttf-root-installer at lenny)
 		skip_always "download location disappeared"
 		;;
+	usrmerge@*)
+		skip_always "performs piuparts-unfriendy filesystem layout changes"
+		;;
 	webissues-server at jessie)
 		# removed after jessie
 		skip_distupgrade "#677062: fails to purge - command ucf in postrm not found"
diff --git a/custom-scripts/scripts/pre_remove_exceptions b/custom-scripts/scripts/pre_remove_exceptions
index 76e4f09..7f5d5d5 100755
--- a/custom-scripts/scripts/pre_remove_exceptions
+++ b/custom-scripts/scripts/pre_remove_exceptions
@@ -47,11 +47,6 @@ case ${PIUPARTS_OBJECTS%%=*} in
 			fi
 		fi
 		;;
-	usrmerge)
-		log_debug
-		# force removal of usrmerge package
-		rm -v /etc/dpkg/dpkg.cfg.d/usrmerge
-		;;
 esac
 
 # Allow removal of the kernel running on the host from the chroot.

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