[Piuparts-commits] [piuparts] 01/01: update the file-rc exception

[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 67a02e717d9343982d1a30e3b40d338a58d382c2
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Feb 23 17:50:46 2016 +0100

    update the file-rc exception
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 custom-scripts/scripts/post_remove_exceptions | 9 ---------
 custom-scripts/scripts/pre_install_exceptions | 2 +-
 custom-scripts/scripts/pre_remove_exceptions  | 9 +++++++++
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/custom-scripts/scripts/post_remove_exceptions b/custom-scripts/scripts/post_remove_exceptions
index b0fec55..c1aca07 100755
--- a/custom-scripts/scripts/post_remove_exceptions
+++ b/custom-scripts/scripts/post_remove_exceptions
@@ -6,15 +6,6 @@ log_debug() {
 }
 
 case ${PIUPARTS_OBJECTS%%=*} in
-	file-rc)
-		case "$PIUPARTS_DISTRIBUTION" in
-			lenny|squeeze*)
-				log_debug
-				# removal wont work if sysv-rc isn't reinstalled
-				yes 'Yes, do as I say!' | apt-get -y --force-yes install sysv-rc
-				;;
-		esac
-		;;
 	asclassic)
 		case "$PIUPARTS_DISTRIBUTION" in
 			lenny)
diff --git a/custom-scripts/scripts/pre_install_exceptions b/custom-scripts/scripts/pre_install_exceptions
index b7464e1..e3878ab 100755
--- a/custom-scripts/scripts/pre_install_exceptions
+++ b/custom-scripts/scripts/pre_install_exceptions
@@ -8,7 +8,7 @@ log_debug() {
 case ${PIUPARTS_OBJECTS%%=*} in
 	file-rc)
 		case "$PIUPARTS_DISTRIBUTION" in
-			lenny|squeeze*)
+			lenny|squeeze*|stretch*|sid)
 				# force installation and removal of essential package sysv-rc
 				log_debug
 				yes 'Yes, do as I say!' | apt-get -y --force-yes install file-rc
diff --git a/custom-scripts/scripts/pre_remove_exceptions b/custom-scripts/scripts/pre_remove_exceptions
index f123b00..48893c6 100755
--- a/custom-scripts/scripts/pre_remove_exceptions
+++ b/custom-scripts/scripts/pre_remove_exceptions
@@ -6,6 +6,15 @@ log_debug() {
 }
 
 case ${PIUPARTS_OBJECTS%%=*} in
+	file-rc)
+		case "$PIUPARTS_DISTRIBUTION" in
+			lenny|squeeze*)
+				log_debug
+				# removal wont work if sysv-rc isn't reinstalled
+				yes 'Yes, do as I say!' | apt-get -y --force-yes install sysv-rc
+				;;
+		esac
+		;;
 	isdnlog|isdnutils)
 		#WORKSAROUND #431855: fails with "There are still files in /etc/isdn/ that you may want to remove manually."
 		if [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then

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