[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-30-gbd8fd0e

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 7937c71e42129f0f42502145578912a591984d84
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sun Jan 20 23:05:01 2013 +0100

    pre_install_exceptions: handle bootcd-ia64/squeeze
    
    \#622690: bootcd-ia64 has a Pre-Depends/Depends cycle that apt cannot resolve
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/custom-scripts/scripts/pre_install_exceptions b/custom-scripts/scripts/pre_install_exceptions
index 9f4a885..163fb30 100755
--- a/custom-scripts/scripts/pre_install_exceptions
+++ b/custom-scripts/scripts/pre_install_exceptions
@@ -57,6 +57,20 @@ case ${PIUPARTS_OBJECTS%%=*} in
 				;;
 esac
 
+if [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ]; then
+
+	case ${PIUPARTS_OBJECTS%%=*} in
+		bootcd-ia64)
+				if [ "$PIUPARTS_TEST" = "distupgrade" ] && [ "$(uname -m)" = "x86_64" ]; then
+					#622690: bootcd-ia64 has a Pre-Depends/Depends cycle that apt cannot resolve
+					log_debug
+					apt-get -y install bootcd-i386
+				fi
+				;;
+	esac
+
+fi
+
 # allow lenny kernel image installation in chroot
 if [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
 	for flavor in amd64 openvz-amd64 vserver-amd64 xen-amd64 486 686 686-bigmem openvz-686 vserver-686 vserver-686-bigmem xen-686
diff --git a/debian/changelog b/debian/changelog
index 982f9b7..e8deeef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ piuparts (0.50) UNRELEASED; urgency=low
   * piuparts-slave.py:
   * piuparts-analyze.py:
   * piuparts-report.py:
+  * pre_install_exceptions: Handle bootcd-ia64 installation in squeeze.
   * post_distupgrade_exceptions: Handle libdb4.8 removal in wheezy.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Tue, 15 Jan 2013 11:51:43 +0100

-- 
piuparts git repository