diff options
| author | Sam Bingner <sam@bingner.com> | 2018-12-26 13:07:23 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2018-12-26 14:51:59 -1000 |
| commit | 59c3e0b998fd69532159d8dc416109cf50651482 (patch) | |
| tree | 2e58bef1273e4d3542c168980e4a2d793e170045 /apt-pkg/policy.cc | |
| parent | ac0d26d4e39da16bdbf575637fd3d4b24a7fb4b8 (diff) | |
| parent | 2aa218273eb6009880e987f90d3e24b8efb04642 (diff) | |
Merge nitotv apt fixes into 1.4.81.4.8+nitotv
Diffstat (limited to 'apt-pkg/policy.cc')
| -rw-r--r-- | apt-pkg/policy.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 3dd6ddac4..a13510e66 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -320,7 +320,7 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir) bool const PendingErrors = _error->PendingError(); _error->MergeWithStack(); if (PendingErrors) - return false; + return _error->ReturnError(); // Read the files for (vector<string>::const_iterator I = List.begin(); I != List.end(); ++I) @@ -391,6 +391,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(), |