Просмотр исходного кода

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 <guillem@debian.org>
Raphaël Hertzog лет назад: 15
Родитель
Сommit
ea97a8b27d
1 измененных файлов с 4 добавлено и 1 удалено
  1. 4 1
      src/processarc.c

+ 4 - 1
src/processarc.c

@@ -4,6 +4,8 @@
  *
  * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
  * Copyright © 2006-2012 Guillem Jover <guillem@debian.org>
+ * Copyright © 2011 Linaro Limited
+ * Copyright © 2011 Raphaël Hertzog <hertzog@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);