if reading of autobit state failed, let write fail

[apt.git] / apt-pkg / packagemanager.h

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 287f5d19211ca0e8b2a43711232747a5a10a482d..25b6ee7c9bed2bf12fa24b2576ff24f8f5d600fa 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -24,6 +24,7 @@
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/init.h>
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/init.h>

+#include <apt-pkg/edsp.h>

 #include <apt-pkg/macros.h>
 
 #include <string>
 #include <apt-pkg/macros.h>
 
 #include <string>


@@ -43,13 +44,14 @@ class pkgDepCache;
 class pkgSourceList;
 class pkgOrderList;
 class pkgRecords;
 class pkgSourceList;
 class pkgOrderList;
 class pkgRecords;

+class OpProgress;
+class pkgPackageManager;

 namespace APT {
    namespace Progress {
       class PackageManager;
    }
 }
 
 namespace APT {
    namespace Progress {
       class PackageManager;
    }
 }
 

-

 class pkgPackageManager : protected pkgCache::Namespace
 {
    public:
 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
    // 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
 
    // 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
    // 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();
 
    // ?
    bool FixMissing();