The following commit has been merged in the master branch:
commit b8d5e90f41762eb03505bf171cae6ea93918e345
Author: Guillem Jover <[email protected]>
Date: Tue Feb 5 03:23:13 2013 +0100
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.
diff --git a/debian/changelog b/debian/changelog
index 1ef5478..8f5ad99 100644
--- a/debian/changelog
+++ b/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).
diff --git a/dselect/main.cc b/dselect/main.cc
index 64f86d1..6cd4503 100644
--- a/dselect/main.cc
+++ b/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);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
