diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2020-02-26 14:12:34 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2020-02-26 14:12:34 +0100 |
| commit | dc911bdda7cce03bf2b4dd4cfc37bae044ad9f2a (patch) | |
| tree | b5a47f390d0e8bdb0dede9f68758c0f8bc695ef2 /apt-pkg | |
| parent | 069c2e86b21e24e05d3ef8b333d50550a38fa5e2 (diff) | |
Merge pkgPackageManager::SmartUnpack
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/packagemanager.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/packagemanager.h | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index b601172b0..515de972c 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -704,10 +704,6 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg) // --------------------------------------------------------------------- /* This puts the system in a state where it can Unpack Pkg, if Pkg is already unpacked, or when it has been unpacked, if Immediate==true it configures it. */ -bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) -{ - return SmartUnPack(Pkg, true, 0); -} bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth) { bool PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop); diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index f777b3dc3..d95a9f663 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -79,9 +79,7 @@ class pkgPackageManager : protected pkgCache::Namespace // Install helpers bool ConfigureAll(); bool SmartConfigure(PkgIterator Pkg, int const Depth) APT_MUSTCHECK; - //FIXME: merge on abi break - bool SmartUnPack(PkgIterator Pkg) APT_MUSTCHECK; - bool SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth) APT_MUSTCHECK; + bool SmartUnPack(PkgIterator Pkg, bool const Immediate = true, int const Depth = 0) APT_MUSTCHECK; bool SmartRemove(PkgIterator Pkg) APT_MUSTCHECK; bool EarlyRemove(PkgIterator Pkg, DepIterator const * const Dep) APT_MUSTCHECK; |