[Piuparts-commits] [piuparts] 04/06: enable foreign arch i386 for lib32nss-mdns

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit 14ea1e37141d8b88ea922faec1971b64e412cd04
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Jan 30 18:27:27 2014 +0100

    enable foreign arch i386 for lib32nss-mdns
    
    lib32nss-mdns [amd64 only] Depends: libnss-mdns-i386 [i386 only]
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 .../scripts/pre_distupgrade_foreign_architecture_i386          | 10 ++++++++--
 custom-scripts/scripts/pre_install_foreign_architecture_i386   |  1 +
 debian/changelog                                               |  1 +
 piupartslib/packagesdb.py                                      |  2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386 b/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386
index 0bc6617..374d690 100755
--- a/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386
+++ b/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386
@@ -11,16 +11,22 @@ 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
+	ia32-libs|ia32-libs-gtk)  go=yes ;;
+	lib32nss-mdns)  go=yes ;;
+	*)
+		dpkg-query -s "ia32-libs" >/dev/null 2>&1 || exit 0
+		;;
+esac
+
 case ${PIUPARTS_OBJECTS} in
 	*=None)  go=yes ;;
 esac
 
 case ${PIUPARTS_OBJECTS%%=*} in
-	ia32-libs|ia32-libs-gtk)  go=yes ;;
 	*wine*)  go=yes ;;
 	education-thin-client-server|education-workstation)  go=yes ;;
 esac
diff --git a/custom-scripts/scripts/pre_install_foreign_architecture_i386 b/custom-scripts/scripts/pre_install_foreign_architecture_i386
index fa5965b..b83ab97 100755
--- a/custom-scripts/scripts/pre_install_foreign_architecture_i386
+++ b/custom-scripts/scripts/pre_install_foreign_architecture_i386
@@ -13,6 +13,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
 	ia32-libs|ia32-libs-gtk) ;;
 	libwine-unstable|libwine-*-unstable|wine|wine-unstable) ;;
 	boinc-nvidia-cuda|teamspeak-client) ;;
+	lib32nss-mdns) ;;
 	*) exit 0 ;;
 esac
 
diff --git a/debian/changelog b/debian/changelog
index c7c8a6d..50d80f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,7 @@ piuparts (0.57) UNRELEASED; urgency=low
   * piuparts-report.py:
     - Mark essential-required as obsolete and hide it.
   * Add more piuparts exceptions.
+  * Handle lib32nss-mdns like ia32-libs[-gtk].
 
   [ Holger Levsen ]
   * piuparts.py:
diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index bb2ee31..31d181b 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -666,7 +666,7 @@ class PackagesDB:
                 state = db.get_package_state(package_name, resolve_virtual=resolve_virtual, recurse=False)
                 if state != "does-not-exist":
                     return state
-        if package_name in ["ia32-libs-i386", "ia32-libs-gtk-i386"]:
+        if package_name in ["ia32-libs-i386", "ia32-libs-gtk-i386", "libnss-mdns-i386"]:
             # HACK! these are arch=i386 packages needed on amd64
             return "essential-required"
         return "does-not-exist"

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