diff options
| author | Michael Vogt <mvo@debian.org> | 2013-10-05 12:30:26 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-10-05 12:30:26 +0200 |
| commit | 3f506f684c6199a9a2bc68365732a9c00dc551c1 (patch) | |
| tree | 45b620ac66ea612069e88fb10b6dbdc9b5166ef7 /apt-pkg/deb | |
| parent | d428d131a29a08fa7c1d95b98b684fb2ebb554c0 (diff) | |
| parent | be297c7ab3c16edcbdd6afc699c73a58e545b599 (diff) | |
rename FORBID_NEW_INSTALL_PACKAGES to FORBID_INSTALL_NEW_PACKAGES
Diffstat (limited to 'apt-pkg/deb')
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 87aab6ee2..68d544e1f 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -635,7 +635,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver, string Version; unsigned int Op; - Start = ParseDepends(Start,Stop,Package,Version,Op,false,!MultiArchEnabled); + Start = ParseDepends(Start, Stop, Package, Version, Op, false, false); if (Start == 0) return _error->Error("Problem parsing dependency %s",Tag); size_t const found = Package.rfind(':'); @@ -717,9 +717,7 @@ bool debListParser::ParseProvides(pkgCache::VerIterator &Ver) } } - if (MultiArchEnabled == false) - return true; - else if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed) + if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed) { string const Package = string(Ver.ParentPkg().Name()).append(":").append("any"); return NewProvidesAllArch(Ver, Package, Ver.VerStr()); |