Sfoglia il codice sorgente

Revert "dselect: Abort select action if any foreign architecture is enabled"

This reverts commit 62467910df606a1daaea096f66018506a3ea451e.

Aborting whenever multiarch is enabled only makes users downgrade to
a version w/o the check, which has worse multiarch support than the
current dselect, so the check ends up being counter-productive.
Guillem Jover 13 anni fa
parent
commit
b8d5e90f41
2 ha cambiato i file con 2 aggiunte e 7 eliminazioni
  1. 2 0
      debian/changelog
  2. 0 7
      dselect/main.cc

+ 2 - 0
debian/changelog

@@ -10,6 +10,8 @@ dpkg (1.16.10) UNRELEASED; urgency=low
     input, including source package control files. Closes: #695919
   * Make sure the OpenGPG armor contains a signature block, even on EOF.
   * Do not accept Armor Header Lines inside a paragraph.
+  * Do not abort dselect when multiarch is detected, as that only makes
+    users downgrade and hold on an older version w/ worse multiarch support.
 
   [ Updated programs translations ]
   * Esperanto (Felipe Castro).

+ 0 - 7
dselect/main.cc

@@ -358,16 +358,9 @@ extern void operator delete(void *p) {
 }
 
 urqresult urq_list(void) {
-  struct dpkg_arch *arch;
-
   modstatdb_open((modstatdb_rw)(msdbrw_writeifposs |
                                 msdbrw_available_readonly));
 
-  // XXX: Multi-Arch is not supported, bail out.
-  for (arch = dpkg_arch_get_list(); arch; arch = arch->next)
-    if (arch->type == arch_foreign)
-      ohshit(_("foreign architectures enabled but multi-arch is not supported"));
-
   curseson();
 
   packagelist *l= new packagelist(&packagelistbindings);