Fix a segfault in the version merger introduced in the previous patch:

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 4494691266009531fec97eb36538ff24325fa7ca..330c788a25319fc74e5cea393946bebfe49b893f 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -29,7 +29,9 @@ class pkgDPkgPM : public pkgPackageManager
    char dpkgbuf[1024];
    int dpkgbuf_pos;
    FILE *term_out;
    char dpkgbuf[1024];
    int dpkgbuf_pos;
    FILE *term_out;

-   
+   FILE *history_out;
+   string dpkg_error;
+

    protected:
 
    // progress reporting
    protected:
 
    // progress reporting


@@ -47,15 +49,13 @@ 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;
    // 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
-   map<string,string> PackageProcessingOps;

    // progress reporting
    unsigned int PackagesDone;
    unsigned int PackagesTotal;
   
    struct Item
    {
    // progress reporting
    unsigned int PackagesDone;
    unsigned int PackagesTotal;
   
    struct Item
    {

-      enum Ops {Install, Configure, Remove, Purge} Op;
+      enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op;

       string File;
       PkgIterator Pkg;
       Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op),
       string File;
       PkgIterator Pkg;
       Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op),


@@ -68,6 +68,7 @@ class pkgDPkgPM : public pkgPackageManager
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);

+   void WriteHistoryTag(string tag, string value);

 
    // dpkg log
    bool OpenLog();
 
    // dpkg log
    bool OpenLog();