The following commit has been merged in the master branch:
commit ea97a8b27d958de7ddfea5e2be623d8d16e998c4
Author: Raphaël Hertzog <hert...@debian.org>
Date: Mon Jan 24 11:59:35 2011 +0100
dpkg: Update architecture check to allow foreign architectures
Packages whose architecture has been whitelisted with
--add-architecture do not need --force-architecture to be installed.
Even foreign packages which are “Multi-Arch: no” can be installed
provided that all their foreign dependencies are already satisfied.
Sponsored-by: Linaro Limited
Signed-off-by: Guillem Jover <guil...@debian.org>
diff --git a/src/processarc.c b/src/processarc.c
index 0cc7628..a633e79 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -4,6 +4,8 @@
*
* Copyright © 1995 Ian Jackson <i...@chiark.greenend.org.uk>
* Copyright © 2006-2012 Guillem Jover <guil...@debian.org>
+ * Copyright © 2011 Linaro Limited
+ * Copyright © 2011 Raphaël Hertzog <hert...@debian.org>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -475,7 +477,8 @@ void process_archive(const char *filename) {
}
if (pkg->available.arch->type != arch_all &&
- pkg->available.arch->type != arch_native)
+ pkg->available.arch->type != arch_native &&
+ pkg->available.arch->type != arch_foreign)
forcibleerr(fc_architecture,
_("package architecture (%s) does not match system (%s)"),
pkg->available.arch->name, dpkg_arch_get(arch_native)->name);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
