[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-811-gcddb6b0

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 2fe32f59cf145af4c5d82b94db66ce8a5d0db42e
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Jun 11 21:44:31 2012 +0200

    scripts: unqualify package names when checking for exceptions
    
    drop the =<version> part before checking PIUPARTS_OBJECTS
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/org/piuparts.debian.org/etc/scripts-debug-purge/post_remove_postrm_set-x b/org/piuparts.debian.org/etc/scripts-debug-purge/post_remove_postrm_set-x
index bae4140..31f7428 100755
--- a/org/piuparts.debian.org/etc/scripts-debug-purge/post_remove_postrm_set-x
+++ b/org/piuparts.debian.org/etc/scripts-debug-purge/post_remove_postrm_set-x
@@ -1,9 +1,9 @@
 #!/bin/sh
 set -e
 
-for target in ${PIUPARTS_OBJECTS}
+for target in ${PIUPARTS_OBJECTS%%=*}
 do
-	pkg=${target%%=*}
+	pkg=${target}
 	postrm=/var/lib/dpkg/info/$pkg.postrm
 	if [ -f $postrm ]; then
 		if head -n 1 $postrm | grep -qE '/bin/(ba)?sh' ; then
diff --git a/org/piuparts.debian.org/etc/scripts/post_purge_exceptions b/org/piuparts.debian.org/etc/scripts/post_purge_exceptions
index c803b0f..11f6b86 100755
--- a/org/piuparts.debian.org/etc/scripts/post_purge_exceptions
+++ b/org/piuparts.debian.org/etc/scripts/post_purge_exceptions
@@ -8,7 +8,7 @@ log_debug() {
 #
 # deal with packages depending on exceptions:
 #
-case $PIUPARTS_OBJECTS in
+case ${PIUPARTS_OBJECTS%%=*} in
 	ltsp-client)		log_debug
 				PIUPARTS_OBJECTS=ltsp-client-core
 				;;
@@ -17,7 +17,7 @@ esac
 #
 # deal with exceptions:
 #
-case $PIUPARTS_OBJECTS in 
+case ${PIUPARTS_OBJECTS%%=*} in
 	fai-nfsroot)		log_debug
 				rm -f /.THIS_IS_THE_FAI_NFSROOT
 				;;
diff --git a/org/piuparts.debian.org/etc/scripts/pre_install_exceptions b/org/piuparts.debian.org/etc/scripts/pre_install_exceptions
index 65b926a..fe6c0f7 100755
--- a/org/piuparts.debian.org/etc/scripts/pre_install_exceptions
+++ b/org/piuparts.debian.org/etc/scripts/pre_install_exceptions
@@ -8,7 +8,7 @@ log_debug() {
 #
 # deal with packages depending on exceptions:
 #
-case $PIUPARTS_OBJECTS in
+case ${PIUPARTS_OBJECTS%%=*} in
 	ltsp-client)		log_debug
 				PIUPARTS_OBJECTS=ltsp-client-core
 				;;
@@ -27,7 +27,7 @@ esac
 #
 # deal with exceptions:
 #
-case $PIUPARTS_OBJECTS in 
+case ${PIUPARTS_OBJECTS%%=*} in
 	fai-nfsroot)		log_debug
 				# fai-nfsroot refuses installation unless this file exist
 				touch /.THIS_IS_THE_FAI_NFSROOT
diff --git a/org/piuparts.debian.org/etc/scripts/pre_remove_exceptions b/org/piuparts.debian.org/etc/scripts/pre_remove_exceptions
index 0eb0348..dd146e4 100755
--- a/org/piuparts.debian.org/etc/scripts/pre_remove_exceptions
+++ b/org/piuparts.debian.org/etc/scripts/pre_remove_exceptions
@@ -8,7 +8,7 @@ log_debug() {
 #
 # deal with exceptions:
 #
-case $PIUPARTS_OBJECTS in 
+case ${PIUPARTS_OBJECTS%%=*} in
 esac
 
 # Allow removal of the kernel running on the host from the chroot.

-- 
piuparts git repository