[Piuparts-commits] [piuparts] 01/02: custom-scripts: only workaround systemd-sysv removal issues on sid, jessie + experimental

[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 722816c9ac23fda31a4f69e0b0d8e436d64e0fe7
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri May 30 13:09:56 2014 +0200

    custom-scripts: only workaround systemd-sysv removal issues on sid, jessie + experimental
---
 custom-scripts/scripts/post_purge_exceptions | 8 ++++++--
 custom-scripts/scripts/pre_remove_exceptions | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/custom-scripts/scripts/post_purge_exceptions b/custom-scripts/scripts/post_purge_exceptions
index 0d95dd6..9eb167c 100755
--- a/custom-scripts/scripts/post_purge_exceptions
+++ b/custom-scripts/scripts/post_purge_exceptions
@@ -45,9 +45,13 @@ case ${PIUPARTS_OBJECTS%%=*} in
 				;;
 		esac
 		;;
-	gdm3|gnome-session|gnome-shell*|gnome-core|gnome|gnome-desktop-environment|razorqt|sucrose-0.96|xfswitch-plugin|mate-core|mate-desktop-environment-core|task-kde-desktop)
+	gdm3|gnome-session|gnome-shell*|gnome-core|gnome|gnome-desktop-environment|task-gnome-desktop|razorqt|sucrose-0.96|xfswitch-plugin|mate-core|mate-desktop-environment*|task-kde-desktop)
 		# see pre_remove_exceptions for why this is needed
 		log_debug
-		dpkg --purge systemd-shim
+		if [ "${PIUPARTS_DISTRIBUTION:0:5}" != "lenny" ] && [ "${PIUPARTS_DISTRIBUTION:0:7}" != "squeeze" ] && [ "${PIUPARTS_DISTRIBUTION:0:6}" != "wheezy" ] ; then
+			dpkg --purge systemd-shim
+		else
+			echo "PIUPARTS_DISTRIBUTION=$PIUPARTS_DISTRIBUTION, not applying systemd-sysv removal workaround"
+		fi
 		;;
 esac
diff --git a/custom-scripts/scripts/pre_remove_exceptions b/custom-scripts/scripts/pre_remove_exceptions
index 92d1e1e..3c12848 100755
--- a/custom-scripts/scripts/pre_remove_exceptions
+++ b/custom-scripts/scripts/pre_remove_exceptions
@@ -22,11 +22,15 @@ case ${PIUPARTS_OBJECTS%%=*} in
 		rm -f /usr/sbin/apt-listbugs
 		dpkg-divert --remove --rename /usr/sbin/apt-listbugs
 		;;
-	gdm3|gnome-session|gnome-shell*|gnome-core|gnome|gnome-desktop-environment|razorqt|sucrose-0.96|xfswitch-plugin|mate-core|mate-desktop-environment-core|task-kde-desktop)
+	gdm3|gnome-session|gnome-shell*|gnome-core|gnome|gnome-desktop-environment|task-gnome-desktop|razorqt|sucrose-0.96|xfswitch-plugin|mate-core|mate-desktop-environment*|task-kde-desktop)
 		# these packages cause installation of systemd-sysv which (currently) needs this help for removing it again
 		# also see post_purge_exceptions for further cleanup
 		log_debug
-		apt-get -y install sysvinit-core
+		if [ "${PIUPARTS_DISTRIBUTION:0:5}" != "lenny" ] && [ "${PIUPARTS_DISTRIBUTION:0:7}" != "squeeze" ] && [ "${PIUPARTS_DISTRIBUTION:0:6}" != "wheezy" ] ; then
+			apt-get -y install sysvinit-core
+		else
+			echo "PIUPARTS_DISTRIBUTION=$PIUPARTS_DISTRIBUTION, not applying systemd-sysv removal workaround"
+		fi
 		;;
 esac
 

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