merged from debian-sid

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 4494691266009531fec97eb36538ff24325fa7ca..62d3d893d8e0660e343412b081c6b11c5b5a2e3e 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -31,6 +31,7 @@ class pkgDPkgPM : public pkgPackageManager
    FILE *term_out;
    
    protected:
+   int pkgFailures;
 
    // progress reporting
    struct DpkgState 
@@ -47,8 +48,12 @@ 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;
-   // map the dpkg "processing" info to human readable names
+
+
+#if 1 // FIXME: BINARY COMPATIBILITY ONLY, remove on next ABI break
    map<string,string> PackageProcessingOps;
+#endif
+
    // progress reporting
    unsigned int PackagesDone;
    unsigned int PackagesTotal;
@@ -69,6 +74,9 @@ class pkgDPkgPM : public pkgPackageManager
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 
+   // apport integration
+   void WriteApportReport(const char *pkgpath, const char *errormsg);
+
    // dpkg log
    bool OpenLog();
    bool CloseLog();