[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.51

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 0568007261262e35c5d7f5d1755eeea7353cdff0
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri Mar 15 23:14:52 2013 +0100

    pre_install_exceptions: fail before mini-buildd-{bld,rep}/squeeze
    
    mini-build-* in squeeze fails to install due to timeout
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/custom-scripts/scripts/pre_install_exceptions b/custom-scripts/scripts/pre_install_exceptions
index 8b221a4..36412a5 100755
--- a/custom-scripts/scripts/pre_install_exceptions
+++ b/custom-scripts/scripts/pre_install_exceptions
@@ -18,7 +18,8 @@ case ${PIUPARTS_OBJECTS%%=*} in
 	live-config-upstart)	log_debug
 				PIUPARTS_OBJECTS=upstart
 				;;
-	clvm|dtc-xen|ganeti|ganeti2|mini-buildd-bld|mylvmbackup|redhat-cluster-suite)
+	clvm|dtc-xen|ganeti|ganeti2|mylvmbackup|redhat-cluster-suite)
+				# skip mini-buildd-bld here due to resource violation, see below
 				log_debug
 				PIUPARTS_OBJECTS=lvm2
 				;;
@@ -74,6 +75,11 @@ if [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ]; then
 					apt-get -y install bootcd-i386
 				fi
 				;;
+		mini-buildd-bld|mini-buildd-rep)
+				#632955, #656746 - time limit exceeded during install
+				log_debug
+				exit 1
+				;;
 	esac
 
 fi

-- 
piuparts git repository