X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/add81166f8ecb194ab5cf881200ab9d890abea6c..503c7d594125f963b92047ad2d9d0644f39136c7:/apt-pkg/packagemanager.h diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 287f5d192..25b6ee7c9 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -43,13 +44,14 @@ class pkgDepCache; class pkgSourceList; class pkgOrderList; class pkgRecords; +class OpProgress; +class pkgPackageManager; namespace APT { namespace Progress { class PackageManager; } } - class pkgPackageManager : protected pkgCache::Namespace { public: @@ -113,7 +115,12 @@ class pkgPackageManager : protected pkgCache::Namespace // Do the installation OrderResult DoInstall(APT::Progress::PackageManager *progress); // compat - APT_DEPRECATED OrderResult DoInstall(int statusFd=-1); + APT_DEPRECATED_MSG("Use APT::Progress::PackageManager subclass instead of fd") OrderResult DoInstall(int statusFd=-1); + + friend bool EIPP::OrderInstall(char const * const planner, pkgPackageManager * const PM, + unsigned int const version, OpProgress * const Progress); + friend bool EIPP::ReadResponse(int const input, pkgPackageManager * const PM, + OpProgress * const Progress); // stuff that needs to be done before the fork() of a library that // uses apt @@ -124,7 +131,7 @@ class pkgPackageManager : protected pkgCache::Namespace // stuff that needs to be done after the fork OrderResult DoInstallPostFork(APT::Progress::PackageManager *progress); // compat - APT_DEPRECATED OrderResult DoInstallPostFork(int statusFd=-1); + APT_DEPRECATED_MSG("Use APT::Progress::PackageManager subclass instead of fd") OrderResult DoInstallPostFork(int statusFd=-1); // ? bool FixMissing();