summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2014-08-24 18:43:07 +0200
committerJulian Andres Klode <jak@debian.org>2014-08-24 18:43:07 +0200
commit8f617600aeb931574baf0b53617e7759baa3f370 (patch)
tree0ec8a8df18b0fdb3684d0de17b7c7ef5c1100542 /apt-pkg
parent5803c1dcf0a6e590cfd98ca8ab11d5573652cb14 (diff)
downloadapt-8f617600aeb931574baf0b53617e7759baa3f370.tar.gz
Fix debListParser to accept "no" as a value for the Multi-Arch field
Seems this was missed somehow. Closes: #759099
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/deb/deblistparser.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 02b9cb239..28c898542 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -108,7 +108,7 @@ unsigned char debListParser::ParseMultiArch(bool const showErrors) /*{{{*/
{
unsigned char MA;
string const MultiArch = Section.FindS("Multi-Arch");
- if (MultiArch.empty() == true)
+ if (MultiArch.empty() == true || MultiArch == "no")
MA = pkgCache::Version::None;
else if (MultiArch == "same") {
if (ArchitectureAll() == true)