[Piuparts-commits] [piuparts] 01/10: cleanup piuparts exceptions

[Holger Levsen]

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

holger pushed a commit to branch master
in repository piuparts.

commit 1ddc922b203415ae2f676bf79423c40a6374e9ab
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Jan 15 19:51:13 2017 +0100

    cleanup piuparts exceptions
    
    - squeeze-proposed is obsolete since squeeze was archived
    - sync initial-install-only handling
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 .../scripts-squeeze/post_setup_squeeze-fake-essential       |  2 +-
 custom-scripts/scripts/post_setup_forbid_home               |  2 +-
 custom-scripts/scripts/pre_install_exceptions               |  1 -
 custom-scripts/scripts/pre_install_extras                   | 13 ++++++++-----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential b/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
index f3492b5..ad74ed8 100755
--- a/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
+++ b/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
@@ -22,7 +22,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
 	gosa-desktop|kde-core|kde-full|kde-plasma-desktop|kde-standard|kdebase-apps|konqueror|konq-plugins|mozart-doc|texlive-full)
 		# work around #601961: apt: wrongly thinks install-info is essential
 		case ${PIUPARTS_DISTRIBUTION} in
-			squeeze|squeeze-proposed|squeeze-lts)
+			squeeze|squeeze-lts)
 				FAILS_TO_REMOVE="$FAILS_TO_REMOVE install-info"
 				;;
 		esac
diff --git a/custom-scripts/scripts/post_setup_forbid_home b/custom-scripts/scripts/post_setup_forbid_home
index 2c958ae..ff9b4a7 100755
--- a/custom-scripts/scripts/post_setup_forbid_home
+++ b/custom-scripts/scripts/post_setup_forbid_home
@@ -9,7 +9,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
 esac
 
 case $PIUPARTS_DISTRIBUTION in
-	lenny|squeeze|squeeze-proposed)
+	lenny|squeeze)
 		exit 0
 		;;
 esac
diff --git a/custom-scripts/scripts/pre_install_exceptions b/custom-scripts/scripts/pre_install_exceptions
index 3bbe2d4..5837dd4 100755
--- a/custom-scripts/scripts/pre_install_exceptions
+++ b/custom-scripts/scripts/pre_install_exceptions
@@ -119,7 +119,6 @@ if [ "$PIUPARTS_DISTRIBUTION" = "squeeze-backports" ]; then
 fi
 
 if	[ "$PIUPARTS_DISTRIBUTION" = "squeeze" ] || \
-	[ "$PIUPARTS_DISTRIBUTION" = "squeeze-proposed" ] || \
 	[ "$PIUPARTS_DISTRIBUTION" = "squeeze-backports" ] || \
 	[ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
 
diff --git a/custom-scripts/scripts/pre_install_extras b/custom-scripts/scripts/pre_install_extras
index 7f4e612..5195f55 100755
--- a/custom-scripts/scripts/pre_install_extras
+++ b/custom-scripts/scripts/pre_install_extras
@@ -5,9 +5,14 @@ log_debug() {
 	echo "Debug: piuparts extra for package $PIUPARTS_OBJECTS"
 }
 
-if [ "$PIUPARTS_PHASE" = "install" ]; then
+#
+# these extras are only for the initial package installation
+#
+if [ "$PIUPARTS_PHASE" != "install" ]; then
+	exit 0
+fi
 
-    case ${PIUPARTS_OBJECTS%%=*} in
+case ${PIUPARTS_OBJECTS%%=*} in
 	*dkms|\
 	ktap|\
 	zfs-*|\
@@ -40,6 +45,4 @@ if [ "$PIUPARTS_PHASE" = "install" ]; then
 				;;
 		esac
 		;;
-    esac
-
-fi
+esac

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