make setup in travis.yml a bit more verbose

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index ddf9485c746d2d9f9a0f949a815d07a1b46fa72e..c31d56f8ea995c4563ecb090df5bc75bc86015d7 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -14,9 +14,12 @@
 #include <vector>
 #include <map>
 #include <stdio.h>
 #include <vector>
 #include <map>
 #include <stdio.h>

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

 
 

+#ifndef APT_8_CLEANER_HEADERS

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

+#endif

 
 class pkgDPkgPMPrivate;
 
 
 class pkgDPkgPMPrivate;
 


@@ -38,7 +41,7 @@ class pkgDPkgPM : public pkgPackageManager
       needs to declare a Replaces on the disappeared package.
       \param pkgname Name of the package that disappeared
    */
       needs to declare a Replaces on the disappeared package.
       \param pkgname Name of the package that disappeared
    */

-   void handleDisappearAction(string const &pkgname);
+   void handleDisappearAction(std::string const &pkgname);

 
    protected:
    int pkgFailures;
 
    protected:
    int pkgFailures;


@@ -53,11 +56,11 @@ 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;
 
    // progress reporting
    unsigned int PackagesDone;


@@ -66,19 +69,20 @@ class pkgDPkgPM : public pkgPackageManager
    struct Item
    {
       enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op;
    struct Item
    {
       enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op;

-      string File;
+      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);
 
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);

-   bool SendV2Pkgs(FILE *F);
-   void WriteHistoryTag(string const &tag, string value);
+   __deprecated bool SendV2Pkgs(FILE *F);
+   bool SendPkgsInfo(FILE * const F, unsigned int const &Version);
+   void WriteHistoryTag(std::string const &tag, std::string value);

 
    // apport integration
    void WriteApportReport(const char *pkgpath, const char *errormsg);
 
    // apport integration
    void WriteApportReport(const char *pkgpath, const char *errormsg);


@@ -94,7 +98,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);


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

+void SigINT(int sig);
+

 #endif
 #endif