Re: apt-get build-dep -a $arch: wrong tradeoff for the default?

Steve Langasek <[email protected]> Sun, 6 Nov 2011 17:20:25 -0800

Newsgroups	gmane.linux.debian.devel.embedded
Message-ID	<[email protected]>

On Sun, Nov 06, 2011 at 05:09:02PM -0800, Steve Langasek wrote:
> Attached is a patch that mostly works for this, except that Architecture:
> all, Multi-Arch: no packages are regarded as satisfying build-dependencies
> when they probably shouldn't.

> Comments welcome.

Bah, cut'n'waste error.  Fixed patch attached.

Note that there also seems to have been an error in the handling of M-A:
same build-dependencies, which should be fixed in any case here; an
un-decorated build-dependency on a M-A: same package was apparently being
resolved to the build architecture, and it definitely needs to be resolved
to the host architecture.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
[email protected]                                     [email protected]

apt-646288.patch (text/x-diff, 3.3 KB)

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [email protected]
# target_branch: lp:~ubuntu-core-dev/apt/ubuntu
# testament_sha1: d936cd4e6afab33225755a982c7c5f26d94e8d51
# timestamp: 2011-11-06 17:12:40 -0800
# base_revision_id: [email protected]\
#   hrfjh6ryjlx2xkdd
# 
# Begin patch
=== modified file 'cmdline/apt-get.cc'
--- cmdline/apt-get.cc	2011-09-13 15:51:34 +0000
+++ cmdline/apt-get.cc	2011-11-07 01:12:20 +0000
@@ -2835,10 +2835,14 @@
 	       if ((BADVER(Ver)) == false)
 	       {
 		  string forbidden;
-		  if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All);
+		  if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All)
+		  {
+		     if (colon == string::npos)
+			Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
+		  }
 		  else if (Ver->MultiArch == pkgCache::Version::Same)
 		  {
-		     if (colon != string::npos)
+		     if (colon == string::npos)
 			Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
 		     else if (strcmp(D->Package.c_str() + colon, ":any") == 0)
 			forbidden = "Multi-Arch: same";

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-20 09:05:18 +0000
+++ debian/changelog	2011-11-07 01:12:20 +0000
@@ -3,6 +3,9 @@
   [ Daniel Hahler ]
   * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903)
 
+  [ Steve Langasek ]
+  * Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH.
+
  -- Michael Vogt <[email protected]>  Thu, 20 Oct 2011 10:58:20 +0200
 
 apt (0.8.16~exp5ubuntu14.1) precise; urgency=low

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWah+xaAAAl1fgGAwUXf//3/n
3wq///9+UAUPdsAAioKFAEkkJppommhjCmQNMRo0yDQ0DQGjTTIcZMmjEMTTAQMCaYIwTE000AGE
Gqn6mhHpNAZBkAAxA0GjIAaAAHGTJoxDE0wEDAmmCMExNNNABhBJImE0TJkAminsjTST1Pak2mgI
aDQDyhpVAgIBQJRf0G49Nsy2JLS1w0/iTSzbuS1EtlMqLR247b8CFIfePxm0LNAtBEZfP8VdDmX4
GYZMwzfv8w8qpGDkCIoi6ASIjCWEeUIODiEC3v/YJi3MRQcgZb6mmYGLCMB+vFIYkY0jw4UUbWd2
nfsyE8jid+4RUHT7CB0Nd5Cr8g/gL/OpyZs3m1ngbofIoiYGw6jlqMAOu0LKbO1mnJVdxZXgH+oY
60DIwXuQ/huNp6iIJg6t4GerDExGICzDhwdgyScBDeGocSEOMhZPvCv1gSCwYKUODOiKotNvEgBe
lDlNznWwRlYFBgGBD73gfHJ2vuxlKPZX5KsooGSJotZwtC0xDj0uzMOtWBkKeYD5Z87wMgsAgfBC
wqFGY/ABiskRUCZFiOyJmZWDWmVTRUWlDaEsigRH6zTgVWc1zi8qjqvMDYSlJsicnpkRHXESRlK3
p4rCscF4+TrSRSIsXouMi6QvoaSBA6KBAftfcMYGS+suYnnNIZzMZyopwDuAhmGKES4uAsIPHmA4
cZEoAyqNOmZopZjnrQ2Z77S5GdiRdDdUZX0fMGGo+cPqwsLy8zESliYyvZDrjQcTMGq3EGTyYTuV
iJdnYIw8BzdIwvWxs7wwzNwZ0xuD1z6RhTDo+K38nycSZ3E7yHQKKDIjEOb0D5j4ojbGGZnHmjOG
+Vg9zMEMxmCI0HwUR4E1pVuoo5dqf2DOUhSx/h0Du5qgxOF9cgsTGBXhPqA0ExkFTDiFllYZoUFj
hZhOu0Hy8w4XSXcZrxXDbtmiw5IyAfAXuA5PV7klDuJyFuz+3QH3HnlAoLCY1NqA7iucAOKfeZS6
PlBBWrifPJHWBXjL58CsmL+heNwUzroYSiK7BO5E0jL8i3xcMWmPI0FwYlQOtSbqiMprFB6DLA1H
Ov2yH0LDKMxzFrFY6tvUcCXcblvO/W3obIVInuLEH5F+Td3GlFdAKlmTC8RUP+TY5aVGsOczq2JR
AyH1LPQ1mIYHpOkgalNdxuOouDpA53r2dW+LhgIDhjnSaXkiKLYawZJTiYCleeIQqClRUsoGFiFU
E6ZDvelEx8zUu81igQ0o/y60w1vjikcEGXi845A9wdRsOgCoD3h4ria0PAriKaKBpN4FSD73w3ml
B6+tFIh1hFIiq189lpw8WWucnqD09A3awk4TCLwNqfAVQMnJwuNQ8TEjcBIUmFehylq1rSJxJxAk
yDUJwcZrwuFRRxo7EFJBGt1SY8JGhxO+7VgLOubm0hBUCBbaUnMas1EAGcKaPsS6UVCYXU5BPjaU
ZPwCtBSQp4lQJnXB9IhBhl4hUOHxGbgTMwVq02mkZJ5IJlbSRIadRSHgjUh8B6LdC4g5rPEtCtWM
XjySJphk9gvZDiaPaj07Chz7weh9MSiZB0o+O07QY5AYg8HnsDaBNGOLZnORreqtHkx/4u5IpwoS
FQ/YtAA=

signature.asc (application/pgp-signature, 828 B)

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIVAwUBTrcyWVaNMPMhshM9AQgYmxAAtyfMeMDM3SEZG+vKPFTc5j6oZtiURMWs
kKLh/WkVRUlsYP9KtJ4Wwg8duw3e38N8sLbNHD4N87ONX5kc1eCEkj8b4qbmr+vq
qtKfHtNStmvkBc5nIFojevynVLghdFOGCeoie2CBAFmpMHW2hWOT8luFxT/DeI4+
gh32ULvWKVYwawkRxicz3oTVhuCXQeaTLmZMYSCioQhkAMxIW9+/Y2b88ke+wA+u
/8RqhfRyu7JMB0zD1SpkjiTI42rWbwhocOeJtHLQCGzTpdy8+vUfcWVtMpMv1XuT
bWUl6smX4MtERlgTebEUITGMPjbQx3tXyhd9daiW3GIG+y3kx3WQL1P3Mvcm24Mf
1iZcbHpsXYeMyXtoZd/TxzL9INv3k/c2RUiD1DcLU+SosidBrvr21sGqri1mO8+Z
RZ88raNeaUc6yl6A9Fl5mvkpUFY0zgkRhc9sqfvrQC2ULEogjfyVv0Tlbu5HkRqH
ugzaQTy3Pvz4ptT4viDAea81B2R0uPsYb8GGvvXX9IeeHMD+yMHvVJJ6LKL7y0of
DJ3pDJbwBAtECNbbk/YMgRrbo0AmsoNq/BJj/FfZ1lo+WZxV44tVA1MlxgYyHs9f
zOhIg3FX3AHsZZ3Eezd9l9BACVA74aYCuBpZvPa+B3Dekxi2gH3PBhIXESYJS5iv
d055BMNtAbE=
=boI/
-----END PGP SIGNATURE-----