[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.49-121-g94f0ee1
Andreas Beckmann
anbe at debian.org
Sun Mar 3 11:26:58 UTC 2013
The following commit has been merged in the piatti branch:
commit 94f0ee1941e4f75ccdb4e808b56d5d4ce8f5dd1c
Author: Andreas Beckmann <anbe at debian.org>
Date: Mon Feb 25 13:16:33 2013 +0100
rework exceptions for ia32-libs
Signed-off-by: Andreas Beckmann <anbe at debian.org>
diff --git a/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386 b/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386
index 4e034b7..ef6d252 100755
--- a/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386
+++ b/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386
@@ -3,6 +3,7 @@ set -e
case "$PIUPARTS_DISTRIBUTION" in
squeeze) ;;
+ squeeze-proposed-updates) ;;
*) exit 0 ;;
esac
@@ -12,12 +13,21 @@ case "$PIUPARTS_DISTRIBUTION_NEXT" in
esac
test "$(dpkg --print-architecture)" = "amd64" || exit 0
+dpkg-query -s "ia32-libs" >/dev/null 2>&1 || exit 0
+
+go=
+
+case ${PIUPARTS_OBJECTS} in
+ *=None) go=yes ;;
+esac
case ${PIUPARTS_OBJECTS%%=*} in
- ia32-libs|ia32-libs-gtk) ;;
- *) exit 0 ;;
+ ia32-libs|ia32-libs-gtk) go=yes ;;
+ *wine*) go=yes ;;
esac
+test -n "$go" || exit 0
+
echo "Enabling foreign architecture i386 for $PIUPARTS_OBJECTS"
apt-get update
apt-get -y install apt dpkg
diff --git a/custom-scripts/scripts/pre_install_foreign_architecture_i386 b/custom-scripts/scripts/pre_install_foreign_architecture_i386
index 227c163..556783e 100755
--- a/custom-scripts/scripts/pre_install_foreign_architecture_i386
+++ b/custom-scripts/scripts/pre_install_foreign_architecture_i386
@@ -12,7 +12,7 @@ test "$(dpkg --print-architecture)" = "amd64" || exit 0
case ${PIUPARTS_OBJECTS%%=*} in
ia32-libs|ia32-libs-gtk) ;;
- libwine-unstable|libwine-*-unstable) ;;
+ libwine-unstable|libwine-*-unstable|wine|wine-unstable) ;;
boinc-nvidia-cuda|teamspeak-client) ;;
*) exit 0 ;;
esac
--
piuparts git repository
More information about the Piuparts-commits
mailing list