Merge remote-tracking branch 'upstream/debian/sid' into debian/sid

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 3f95c51dc9cd37f72806c21708f99b97ec87bc1d..859c74b46a682335052ce8324cd96c8482a67cee 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -11,15 +11,29 @@
 #define PKGLIB_DPKGPM_H
 
 #include <apt-pkg/packagemanager.h>
 #define PKGLIB_DPKGPM_H
 
 #include <apt-pkg/packagemanager.h>

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

 #include <vector>
 #include <map>
 #include <stdio.h>
 #include <vector>
 #include <map>
 #include <stdio.h>

+#include <string>
+
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/init.h>
+#endif
+
+class pkgDepCache;
+namespace APT { namespace Progress { class PackageManager; } }

 
 

+#ifndef APT_8_CLEANER_HEADERS

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

+#endif

 
 class pkgDPkgPMPrivate;
 
 
 class pkgDPkgPMPrivate;
 

+

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


@@ -38,7 +52,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 +67,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 +80,25 @@ 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);
+   APT_DEPRECATED bool SendV2Pkgs(FILE *F);
+   bool SendPkgsInfo(FILE * const F, unsigned int const &Version);
+   void WriteHistoryTag(std::string const &tag, std::string value);
+   std::string ExpandShortPackageName(pkgDepCache &Cache,
+                                      const std::string &short_pkgname);
+
+   // Terminal progress 
+   void SendTerminalProgress(float percentage);

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


@@ -86,18 +106,39 @@ class pkgDPkgPM : public pkgPackageManager
    // dpkg log
    bool OpenLog();
    bool CloseLog();
    // dpkg log
    bool OpenLog();
    bool CloseLog();

+
+   // helper
+   void BuildPackagesProgressMap();
+   void StartPtyMagic();
+   void StopPtyMagic();

    
    // input processing
    void DoStdin(int master);
    void DoTerminalPty(int master);
    
    // input processing
    void DoStdin(int master);
    void DoTerminalPty(int master);

-   void DoDpkgStatusFd(int statusfd, int OutStatusFd);
-   void ProcessDpkgStatusLine(int OutStatusFd, char *line);
+   void DoDpkgStatusFd(int statusfd);
+   void ProcessDpkgStatusLine(char *line);
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
+   void DoDpkgStatusFd(int statusfd, int /*unused*/) {
+      DoDpkgStatusFd(statusfd);
+   }
+   void ProcessDpkgStatusLine(int /*unused*/, char *line) {
+      ProcessDpkgStatusLine(line);
+   }
+#endif
+

 
    // The Actuall installation implementation
 
    // 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 Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge = false);

+
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+   virtual bool Go(APT::Progress::PackageManager *progress);
+#else

    virtual bool Go(int StatusFd=-1);
    virtual bool Go(int StatusFd=-1);

+   bool GoNoABIBreak(APT::Progress::PackageManager *progress);
+#endif
+

    virtual void Reset();
    
    public:
    virtual void Reset();
    
    public: