summaryrefslogtreecommitdiff
path: root/apt-pkg/indexfile.cc
diff options
context:
space:
mode:
authorJay Freeman (saurik) <saurik@saurik.com>2017-01-29 15:01:00 -0800
committerJay Freeman (saurik) <saurik@saurik.com>2017-01-29 15:01:00 -0800
commitbaec76f5f0f9fcbd71f6e2afaa7fc85543bd624c (patch)
treecb0599a658d44b3145d263ac321b97bfebbdd481 /apt-pkg/indexfile.cc
parent9fa247dc9ba2aa28ae564e96cba5b2b23bcac91b (diff)
The entire concept of PendingError() is flawed :/.
Diffstat (limited to 'apt-pkg/indexfile.cc')
-rw-r--r--apt-pkg/indexfile.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 74d46d699..21765388f 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -344,6 +344,7 @@ pkgCacheListParser * pkgDebianIndexFile::CreateListParser(FileFd &Pkg)
if (newError)
{
delete Parser;
+ _error->ReturnError();
return nullptr;
}
else
@@ -377,7 +378,7 @@ bool pkgDebianIndexFile::Merge(pkgCacheGenerator &Gen,OpProgress * const Prog)
File->mtime = Pkg.ModificationTime();
if (Gen.MergeList(*Parser) == false)
- return _error->Warning("Problem with MergeList %s",PackageFile.c_str());
+ return _error->Error("Problem with MergeList %s",PackageFile.c_str());
return true;
}
pkgCache::PkgFileIterator pkgDebianIndexFile::FindInCache(pkgCache &Cache) const