diff options
author | David Kalnischkies <david@kalnischkies.de> | 2014-05-16 17:28:11 +0200 |
---|---|---|
committer | David Kalnischkies <david@kalnischkies.de> | 2014-05-22 17:43:48 +0200 |
commit | 71e7a0f3a432828e5bd5498297051aa37e7f0a59 (patch) | |
tree | c12d129b7dfb0667697a12f0e2553e11d6345db7 /apt-pkg/packagemanager.h | |
parent | 1038d077588956448a423ed1c3887524a90d6532 (diff) |
consistently fail if Smart* packagemanager actions fail
These failure conditions come with an error message attached and the
conditions aren't workaroundable (otherwise this would have been done
instead of returning failure), so not erroring out here means that we
execute dpkg later on with a known not-working ordering adding insult
(our own error messages at the end) to injury (dpkg failure).
Diffstat (limited to 'apt-pkg/packagemanager.h')
-rw-r--r-- | apt-pkg/packagemanager.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 344ed9192..d690644f1 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -79,12 +79,12 @@ class pkgPackageManager : protected pkgCache::Namespace // Install helpers bool ConfigureAll(); - bool SmartConfigure(PkgIterator Pkg, int const Depth); + bool SmartConfigure(PkgIterator Pkg, int const Depth) APT_MUSTCHECK; //FIXME: merge on abi break - bool SmartUnPack(PkgIterator Pkg); - bool SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth); - bool SmartRemove(PkgIterator Pkg); - bool EarlyRemove(PkgIterator Pkg); + bool SmartUnPack(PkgIterator Pkg) APT_MUSTCHECK; + bool SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth) APT_MUSTCHECK; + bool SmartRemove(PkgIterator Pkg) APT_MUSTCHECK; + bool EarlyRemove(PkgIterator Pkg) APT_MUSTCHECK; // The Actual installation implementation virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;}; |