diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:25 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:25 +0100 |
| commit | 3b13b8a0b79d625d2913518529a34e92b4f41539 (patch) | |
| tree | 404745c04c1eb4548bd6151034229c98d97d36f6 /apt-pkg/packagemanager.cc | |
| parent | 4935c8af8acd8856211c0a527bf4dec4dace0d08 (diff) | |
| parent | e1024dc0acf72b9615c0821f005364543775a58a (diff) | |
Merge branch 'pu/abi6'
Diffstat (limited to 'apt-pkg/packagemanager.cc')
| -rw-r--r-- | apt-pkg/packagemanager.cc | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 156f7adb5..21905c7b6 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -632,10 +632,6 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) // PM::EarlyRemove - Perform removal of packages before their time /*{{{*/ // --------------------------------------------------------------------- /* This is called to deal with conflicts arising from unpacking */ -bool pkgPackageManager::EarlyRemove(PkgIterator Pkg) -{ - return EarlyRemove(Pkg, NULL); -} bool pkgPackageManager::EarlyRemove(PkgIterator Pkg, DepIterator const * const Dep) { if (List->IsNow(Pkg) == false) @@ -1128,19 +1124,6 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() return Completed; } -// PM::DoInstallPostFork - compat /*{{{*/ -// --------------------------------------------------------------------- - /*}}}*/ -pkgPackageManager::OrderResult -pkgPackageManager::DoInstallPostFork(int statusFd) -{ - APT::Progress::PackageManager *progress = new - APT::Progress::PackageManagerProgressFd(statusFd); - pkgPackageManager::OrderResult res = DoInstallPostFork(progress); - delete progress; - return res; -} - /*}}}*/ // PM::DoInstallPostFork - Does install part that happens after the fork /*{{{*/ // --------------------------------------------------------------------- pkgPackageManager::OrderResult @@ -1160,19 +1143,6 @@ pkgPackageManager::DoInstallPostFork(APT::Progress::PackageManager *progress) /*}}}*/ // PM::DoInstall - Does the installation /*{{{*/ // --------------------------------------------------------------------- -/* compat */ -pkgPackageManager::OrderResult -pkgPackageManager::DoInstall(int statusFd) -{ - APT::Progress::PackageManager *progress = new - APT::Progress::PackageManagerProgressFd(statusFd); - OrderResult res = DoInstall(progress); - delete progress; - return res; - } - /*}}}*/ -// PM::DoInstall - Does the installation /*{{{*/ -// --------------------------------------------------------------------- /* This uses the filenames in FileNames and the information in the DepCache to perform the installation of packages.*/ pkgPackageManager::OrderResult |