summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman (saurik) <saurik@saurik.com>2016-12-30 13:49:21 -0800
committerSam Bingner <sam@bingner.com>2019-08-17 12:43:03 -1000
commitbb696a6ae4385fd77dbee3b700cacc6478b26a93 (patch)
tree7fb6daf6d9b28de96781fc08aef18bd7e5dbd2c9
parentf7771a426fcd7d18b88f18454b08a88cdab515b6 (diff)
My "tolerance" patch was a tad bit overzealous :(.
-rw-r--r--apt-pkg/deb/deblistparser.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 91252da5e..68c3498c8 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -860,10 +860,8 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
unsigned int Op;
Start = ParseDepends(Start, Stop, Package, Version, Op, false, false, false, myArch);
- if (Start == 0) {
- _error->Warning("Problem parsing dependency %zu",static_cast<size_t>(Key)); // TODO
- continue;
- }
+ if (Start == 0)
+ return _error->Warning("Problem parsing dependency %zu",static_cast<size_t>(Key)); // TODO
size_t const found = Package.rfind(':');
if (found == string::npos)
@@ -930,10 +928,8 @@ bool debListParser::ParseProvides(pkgCache::VerIterator &Ver)
{
Start = ParseDepends(Start,Stop,Package,Version,Op, false, false, false);
const size_t archfound = Package.rfind(':');
- if (Start == 0) {
- _error->Warning("Problem parsing Provides line");
- continue;
- }
+ if (Start == 0)
+ return _error->Warning("Problem parsing Provides line");
if (unlikely(Op != pkgCache::Dep::NoOp && Op != pkgCache::Dep::Equals)) {
_error->Warning("Ignoring Provides line with non-equal DepCompareOp for package %s", Package.to_string().c_str());
} else if (archfound != string::npos) {