summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2015-05-07 10:41:34 +0200
committerMichael Vogt <mvo@ubuntu.com>2015-05-07 10:41:34 +0200
commitaccd8215ca9a1cb10e92a059d71eb02aac2f0743 (patch)
treead673f0421bf5dc2b3f6ab5e91f5dd074bd2661c /apt-pkg/deb
parentb32f5e0d93608f82a7516440a6da7a3131eb358e (diff)
parent4694e07d450baa13fa04482752ca369a5797c640 (diff)
Merge branch 'debian/jessie' into ubuntu/master1.0.9.9ubuntu1
Conflicts: configure.ac debian/changelog
Diffstat (limited to 'apt-pkg/deb')
-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 4eef66c2b..213235c2b 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -770,7 +770,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
if (NewDepends(Ver,Package,"none",Version,Op,Type) == false)
return false;
}
- else if (MultiArchEnabled == true && found != string::npos &&
+ else if (found != string::npos &&
strcmp(Package.c_str() + found, ":any") != 0)
{
string Arch = Package.substr(found+1, string::npos);