g++ 4.7 fixes

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index ebc7e32bf9fc3c3ddf204b66708363fc152a308b..aab39f633a9a1e4c3a5018102d939899deadb98c 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -15,22 +15,35 @@
 #include <map>
 #include <stdio.h>
 
 #include <map>
 #include <stdio.h>
 

+#ifndef APT_8_CLEANER_HEADERS

 using std::vector;
 using std::map;
 using std::vector;
 using std::map;

+#endif

 
 

+class pkgDPkgPMPrivate;

 
 class pkgDPkgPM : public pkgPackageManager
 {
    private:
 
 class pkgDPkgPM : public pkgPackageManager
 {
    private:

+   pkgDPkgPMPrivate *d;

 
 

-   bool stdin_is_dev_null;
+   /** \brief record the disappear action and handle accordingly
+
+      dpkg let packages disappear then they have no files any longer and
+      nothing depends on them. We need to collect this as dpkg as well as
+      APT doesn't know beforehand that the package will disappear, so the
+      only possible option is to tell the user afterwards about it.
+      To enhance the experience we also try to forward the auto-install
+      flag so the disappear-causer(s) are not autoremoved next time -
+      for the transfer to happen the disappeared version needs to depend
+      on the package the flag should be forwarded to and this package
+      needs to declare a Replaces on the disappeared package.
+      \param pkgname Name of the package that disappeared
+   */
+   void handleDisappearAction(std::string const &pkgname);

 
 

-   // the buffer we use for the dpkg status-fd reading
-   char dpkgbuf[1024];
-   int dpkgbuf_pos;
-   FILE *term_out;
-   

    protected:
    protected:

+   int pkgFailures;

 
    // progress reporting
    struct DpkgState 
 
    // progress reporting
    struct DpkgState 


@@ -42,30 +55,35 @@ class pkgDPkgPM : public pkgPackageManager
    // the dpkg states that the pkg will run through, the string is 
    // the package, the vector contains the dpkg states that the package
    // will go through
    // the dpkg states that the pkg will run through, the string is 
    // the package, the vector contains the dpkg states that the package
    // will go through

-   map<string,vector<struct DpkgState> > PackageOps;
+   std::map<std::string,std::vector<struct DpkgState> > PackageOps;

    // the dpkg states that are already done; the string is the package
    // 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")
    // the dpkg states that are already done; the string is the package
    // 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;
+   std::map<std::string,unsigned int> PackageOpsDone;
+

    // 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;
-      string File;
+      enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op;
+      std::string File;

       PkgIterator Pkg;
       PkgIterator Pkg;

-      Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op),
+      Item(Ops Op,PkgIterator Pkg,std::string File = "") : Op(Op),

             File(File), Pkg(Pkg) {};
       Item() {};
       
    };
             File(File), Pkg(Pkg) {};
       Item() {};
       
    };

-   vector<Item> List;
+   std::vector<Item> List;

 
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);

+   void WriteHistoryTag(std::string const &tag, std::string value);
+
+   // apport integration
+   void WriteApportReport(const char *pkgpath, const char *errormsg);

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


@@ -78,7 +96,7 @@ class pkgDPkgPM : public pkgPackageManager
    void ProcessDpkgStatusLine(int OutStatusFd, char *line);
 
    // The Actuall installation implementation
    void ProcessDpkgStatusLine(int OutStatusFd, char *line);
 
    // The Actuall installation implementation

-   virtual bool Install(PkgIterator Pkg,string File);
+   virtual bool Install(PkgIterator Pkg,std::string File);

    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge = false);
    virtual bool Go(int StatusFd=-1);
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge = false);
    virtual bool Go(int StatusFd=-1);


@@ -90,4 +108,6 @@ class pkgDPkgPM : public pkgPackageManager
    virtual ~pkgDPkgPM();
 };
 
    virtual ~pkgDPkgPM();
 };
 

+void SigINT(int sig);
+

 #endif
 #endif