fix crash when P.Arch() was used but the cache got remapped

[apt.git] / apt-pkg / deb / dpkgpm.h

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 9a4478f7cd018887d567378a5525ef2ffd8f0b43..ddf9485c746d2d9f9a0f949a815d07a1b46fa72e 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -18,19 +18,12 @@
 using std::vector;
 using std::map;
 
+class pkgDPkgPMPrivate;
 
 class pkgDPkgPM : public pkgPackageManager
 {
    private:
-
-   bool stdin_is_dev_null;
-
-   // the buffer we use for the dpkg status-fd reading
-   char dpkgbuf[1024];
-   int dpkgbuf_pos;
-   FILE *term_out;
-   FILE *history_out;
-   string dpkg_error;
+   pkgDPkgPMPrivate *d;
 
    /** \brief record the disappear action and handle accordingly
 
@@ -48,6 +41,7 @@ class pkgDPkgPM : public pkgPackageManager
    void handleDisappearAction(string const &pkgname);
 
    protected:
+   int pkgFailures;
 
    // progress reporting
    struct DpkgState 
@@ -64,6 +58,7 @@ class pkgDPkgPM : public pkgPackageManager
    // the int is the state that is already done (e.g. a package that is
    // going to be install is already in state "half-installed")
    map<string,unsigned int> PackageOpsDone;
+
    // progress reporting
    unsigned int PackagesDone;
    unsigned int PackagesTotal;
@@ -85,6 +80,9 @@ class pkgDPkgPM : public pkgPackageManager
    bool SendV2Pkgs(FILE *F);
    void WriteHistoryTag(string const &tag, string value);
 
+   // apport integration
+   void WriteApportReport(const char *pkgpath, const char *errormsg);
+
    // dpkg log
    bool OpenLog();
    bool CloseLog();