diff options
author | Jay Freeman (saurik) <saurik@saurik.com> | 2017-01-29 15:01:00 -0800 |
---|---|---|
committer | Sam Bingner <sam@bingner.com> | 2019-08-17 12:47:29 -1000 |
commit | 54cc69889ed056d93e416fa76c4d6a6b0ed30ebc (patch) | |
tree | a3df6779af006394dcf147a59586f588ee43b1b9 /apt-pkg/deb/debindexfile.cc | |
parent | aa376cf54fbf98b7f13f86c2d46e19d6c941876b (diff) |
The entire concept of PendingError() is flawed :/.
Diffstat (limited to 'apt-pkg/deb/debindexfile.cc')
-rw-r--r-- | apt-pkg/deb/debindexfile.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 25e0a3312..78e3eecb7 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -130,7 +130,7 @@ pkgCacheListParser * debTranslationsIndex::CreateListParser(FileFd &Pkg) std::unique_ptr<pkgCacheListParser> Parser(new debTranslationsParser(&Pkg)); bool const newError = _error->PendingError(); _error->MergeWithStack(); - return newError ? nullptr : Parser.release(); + return newError ? ((void)_error->ReturnError(), nullptr) : Parser.release(); } /*}}}*/ // dpkg/status Index /*{{{*/ @@ -158,7 +158,7 @@ pkgCacheListParser * debStatusIndex::CreateListParser(FileFd &Pkg) std::unique_ptr<pkgCacheListParser> Parser(new debStatusListParser(&Pkg)); bool const newError = _error->PendingError(); _error->MergeWithStack(); - return newError ? nullptr : Parser.release(); + return newError ? ((void)_error->ReturnError(), nullptr) : Parser.release(); } /*}}}*/ // DebPkgFile Index - a single .deb file as an index /*{{{*/ @@ -228,7 +228,7 @@ pkgCacheListParser * debDebPkgFileIndex::CreateListParser(FileFd &Pkg) std::unique_ptr<pkgCacheListParser> Parser(new debDebFileParser(&Pkg, DebFile)); bool const newError = _error->PendingError(); _error->MergeWithStack(); - return newError ? nullptr : Parser.release(); + return newError ? ((void)_error->ReturnError(), nullptr) : Parser.release(); } uint8_t debDebPkgFileIndex::GetIndexFlags() const { |