summaryrefslogtreecommitdiff
path: root/apt-pkg/policy.cc
diff options
context:
space:
mode:
authorJay Freeman (saurik) <saurik@saurik.com>2017-01-29 15:01:00 -0800
committerSam Bingner <sam@bingner.com>2020-07-17 00:22:23 -1000
commitbf52d8261295b37473df85c4d15130350ddb6f2a (patch)
treed89125003addce619c37586c9b9b364bc56f9a9d /apt-pkg/policy.cc
parentd1fc58d91e2ef47c58adb19ac2c0c541f4bae45c (diff)
The entire concept of PendingError() is flawed :/.
Diffstat (limited to 'apt-pkg/policy.cc')
-rw-r--r--apt-pkg/policy.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 7986aa506..614539266 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -333,7 +333,7 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir)
bool const PendingErrors = _error->PendingError();
_error->MergeWithStack();
if (PendingErrors)
- return false;
+ return _error->ReturnError();
// Read the files
bool good = true;
@@ -415,6 +415,7 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
if (priority < std::numeric_limits<short>::min() ||
priority > std::numeric_limits<short>::max() ||
newError) {
+ _error->ReturnError();
return _error->Error(_("%s: Value %s is outside the range of valid pin priorities (%d to %d)"),
File.c_str(), Tags.FindS("Pin-Priority").c_str(),
std::numeric_limits<short>::min(),