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

Ubuntu dpkg 1.16.3ubuntu2



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: Tue, 19 Jun 2012 18:08:02 -0700
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.16.3ubuntu2
Distribution: quantal
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Steve Langasek <steve.langasek@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
Launchpad-Bugs-Fixed: 1015329
Changes: 
 dpkg (1.16.3ubuntu2) quantal; urgency=low
 .
   * lib/dpkg/pkg-spec.c: map unqualified package names of multiarch-same
     packages to the native arch instead of throwing an error, so that we
     don't break on upgrade when there are unqualified names stored in dpkg's
     own trigger database.  LP: #1015329.
Checksums-Sha1: 
 de639d43d54cc1d7fbfd674cc5c4cf09451ad99d 2113 dpkg_1.16.3ubuntu2.dsc
 9c476535db924c78c92d053a069da95a9daa2715 5635300 dpkg_1.16.3ubuntu2.tar.bz2
Checksums-Sha256: 
 9fdfd769116379016de6aa34912900add04f2b11a2608750b4b51d3e56a87f57 2113 dpkg_1.16.3ubuntu2.dsc
 9a3c0f5ac0e74ed3bc8f6acc341cd3f3af99f9ee1323f40de6e0ba643b1e015b 5635300 dpkg_1.16.3ubuntu2.tar.bz2
Files: 
 c7cdb922a6e894585487b79dacdd00cd 2113 admin required dpkg_1.16.3ubuntu2.dsc
 30fd17748105a1af964b9352ff5d71af 5635300 admin required dpkg_1.16.3ubuntu2.tar.bz2
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
diff -pruN 1.16.3ubuntu1/debian/changelog 1.16.3ubuntu2/debian/changelog
--- 1.16.3ubuntu1/debian/changelog	2012-06-19 09:22:30.000000000 +0000
+++ 1.16.3ubuntu2/debian/changelog	2012-06-20 01:08:03.000000000 +0000
@@ -1,3 +1,12 @@
+dpkg (1.16.3ubuntu2) quantal; urgency=low
+
+  * lib/dpkg/pkg-spec.c: map unqualified package names of multiarch-same
+    packages to the native arch instead of throwing an error, so that we
+    don't break on upgrade when there are unqualified names stored in dpkg's
+    own trigger database.  LP: #1015329.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 19 Jun 2012 18:08:02 -0700
+
 dpkg (1.16.3ubuntu1) quantal; urgency=low
 
   * Merge with 1.16.3 from unstable:
diff -pruN 1.16.3ubuntu1/lib/dpkg/pkg-spec.c 1.16.3ubuntu2/lib/dpkg/pkg-spec.c
--- 1.16.3ubuntu1/lib/dpkg/pkg-spec.c	2012-04-27 02:49:02.000000000 +0000
+++ 1.16.3ubuntu2/lib/dpkg/pkg-spec.c	2012-06-20 00:29:28.000000000 +0000
@@ -93,10 +93,7 @@ pkg_spec_is_illegal(struct pkg_spec *ps)
 		/* Single instancing only applies with no architecture. */
 		if (ps->arch->type == arch_none &&
 		    pkgset_installed_instances(set) > 1) {
-			snprintf(msg, sizeof(msg),
-			         _("ambiguous package name '%s' with more "
-			           "than one installed instance"), ps->name);
-			return msg;
+			ps->arch = dpkg_arch_get(arch_native);
 		}
 	}
 

Reply to: