diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-07-05 15:40:23 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-07-05 20:44:45 +0200 |
| commit | 5958c7497eea24d55ff305764f058ba1ae836200 (patch) | |
| tree | 8c4eedb14df09aeccfdf732a49c07d82aa074dc7 | |
| parent | cc9745a0d81a3e1aa5ef6f99f7ad638d26bdb950 (diff) | |
report write errors in EDSP/EIPP properly back to caller
Unlikely to happen in practice and I wonder more how I could miss these
in earlier reviews, but okay, lets fix it for consistency now.
| -rw-r--r-- | apt-pkg/edsp.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index 27b269fd2..50db7e05c 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -439,7 +439,7 @@ bool EDSP::WriteScenario(pkgDepCache &Cache, FileFd &output, OpProgress *Progres Progress->Progress(p); } } - return true; + return Okay; } /*}}}*/ // EDSP::WriteLimitedScenario - to the given file descriptor /*{{{*/ @@ -1284,7 +1284,7 @@ bool EIPP::WriteScenario(pkgDepCache &Cache, FileFd &output, OpProgress * const continue; forAllInterestingVersions(Cache, Pkg, WriteVersion); } - return true; + return Okay; } /*}}}*/ // EIPP::ReadResponse - from the given file descriptor /*{{{*/ @@ -1361,7 +1361,7 @@ bool EIPP::ReadResponse(int const input, pkgPackageManager * const PM, OpProgres else if (strcmp(type, "Remove") == 0) PM->Remove(Pkg, PM->Cache[Pkg].Purge()); } - return true; + return in.Failed() == false; } /*}}}*/ bool EIPP::ReadRequest(int const input, std::list<std::pair<std::string,PKG_ACTION>> &actions,/*{{{*/ @@ -1417,9 +1417,6 @@ bool EIPP::ReadRequest(int const input, std::list<std::pair<std::string,PKG_ACTI } } return false; - - - return false; } /*}}}*/ bool EIPP::ApplyRequest(std::list<std::pair<std::string,PKG_ACTION>> &actions,/*{{{*/ |