[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Ubuntu dpkg 1.16.7ubuntu5



This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
Format: 1.8
Date: Fri, 28 Sep 2012 18:37:28 -0600
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.16.7ubuntu5
Distribution: quantal
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Adam Conrad <adconrad@ubuntu.com>
Description: 
 dpkg       - Debian package management system
 dpkg-dev   - Debian package development tools
 dselect    - Debian package management front-end
 libdpkg-dev - Debian package management static library
 libdpkg-perl - Dpkg perl modules
Changes: 
 dpkg (1.16.7ubuntu5) quantal; urgency=low
 .
   * Fix scoping issues in dpkg postinst, so we don't end up doing
     the foreign-architecture migration on every single dpkg upgrade
Checksums-Sha1: 
 7d2d4f099f4ba235d6b0e7ea4ea7b1dbbc9122f2 1483 dpkg_1.16.7ubuntu5.dsc
 75f583e70d6626cdf2e02a288554036eb10bbfdf 3581768 dpkg_1.16.7ubuntu5.tar.xz
Checksums-Sha256: 
 5a59078a66067cf7074a5c4cc3e7a538e3ea5aed0af40ccbaefb49e9dd726185 1483 dpkg_1.16.7ubuntu5.dsc
 67796fa4f29e728ae6f100c14478d18a52b4861fec025a47dfde48621625c4f7 3581768 dpkg_1.16.7ubuntu5.tar.xz
Files: 
 69979220375f68b8dbe3bffd75b717da 1483 admin required dpkg_1.16.7ubuntu5.dsc
 fca5a19a032503f2eae71b5f088b51b4 3581768 admin required dpkg_1.16.7ubuntu5.tar.xz
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
diff -pruN 1.16.7ubuntu4/debian/changelog 1.16.7ubuntu5/debian/changelog
--- 1.16.7ubuntu4/debian/changelog	2012-09-27 09:05:07.000000000 +0000
+++ 1.16.7ubuntu5/debian/changelog	2012-09-29 00:41:19.000000000 +0000
@@ -1,3 +1,10 @@
+dpkg (1.16.7ubuntu5) quantal; urgency=low
+
+  * Fix scoping issues in dpkg postinst, so we don't end up doing
+    the foreign-architecture migration on every single dpkg upgrade
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 28 Sep 2012 18:37:28 -0600
+
 dpkg (1.16.7ubuntu4) quantal; urgency=low
 
   * Apply a workaround from mvo to consider RC packages as multiarch,
diff -pruN 1.16.7ubuntu4/debian/dpkg.postinst 1.16.7ubuntu5/debian/dpkg.postinst
--- 1.16.7ubuntu4/debian/dpkg.postinst	2012-09-26 19:48:34.000000000 +0000
+++ 1.16.7ubuntu5/debian/dpkg.postinst	2012-09-29 00:51:36.000000000 +0000
@@ -67,34 +67,30 @@ create_logfile() {
 new_installs_multiarch()
 {
     if [ "$DPKG_MAINTSCRIPT_ARCH" = "amd64" ]; then
-        if dpkg --compare-versions "$2" lt 1.16.0.3ubuntu4; then
-            dpkg --add-architecture i386
-        fi
+        dpkg --add-architecture i386
     fi
 }
 
 migrate_multiarch_conffile()
 {
-    if dpkg --compare-versions "$2" lt 1.16.3; then
-	ADD_ARCHES=""
-        for i in /etc/dpkg/dpkg.cfg $(run-parts --list /etc/dpkg/dpkg.cfg.d); do
-            ADD_ARCHES="$ADD_ARCHES $(awk '/^foreign-architecture/ {print $2}' $i)"
-            sed -i -e 's/^foreign-architecture/# foreign-architecture/' $i
-        done
-        if [ -f /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-remove ]; then
-            ADD_ARCHES="$ADD_ARCHES $(awk '/^foreign-architecture/ {print $2}' \
-              /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-remove)"
-            rm -f /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-remove
-        elif [ -f /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-backup ]; then
-            ADD_ARCHES="$ADD_ARCHES $(awk '/^foreign-architecture/ {print $2}' \
-              /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-backup)"
-            mv /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-backup \
-              /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-bak
-        fi
-        for i in $ADD_ARCHES; do
-            dpkg --add-architecture $i
-        done
+    ADD_ARCHES=""
+    for i in /etc/dpkg/dpkg.cfg $(run-parts --list /etc/dpkg/dpkg.cfg.d); do
+        ADD_ARCHES="$ADD_ARCHES $(awk '/^foreign-architecture/ {print $2}' $i)"
+        sed -i -e 's/^foreign-architecture/# foreign-architecture/' $i
+    done
+    if [ -f /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-remove ]; then
+        ADD_ARCHES="$ADD_ARCHES $(awk '/^foreign-architecture/ {print $2}' \
+          /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-remove)"
+        rm -f /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-remove
+    elif [ -f /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-backup ]; then
+        ADD_ARCHES="$ADD_ARCHES $(awk '/^foreign-architecture/ {print $2}' \
+          /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-backup)"
+        mv /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-backup \
+          /etc/dpkg/dpkg.cfg.d/multiarch.dpkg-bak
     fi
+    for i in $ADD_ARCHES; do
+        dpkg --add-architecture $i
+    done
 }
 
 case "$1" in
@@ -105,8 +101,13 @@ case "$1" in
 	move_info_directory
 	remove_info_symlink
 
-	new_installs_multiarch
-	migrate_multiarch_conffile
+	if dpkg --compare-versions "$2" lt 1.16.0.3ubuntu4; then
+	    new_installs_multiarch
+        fi
+
+	if dpkg --compare-versions "$2" lt 1.16.3; then
+	    migrate_multiarch_conffile
+	fi
 	;;
 
     abort-upgrade|abort-deconfigure|abort-remove)

Reply to: