support dpkg debug mode in APT::StateChanges

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 4494bbae3290d87daed4b7cde5c5674a0257cda7..408a373344f0beb7108e6787b46785390fd2ed15 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -11,11 +11,20 @@
 #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 <apt-pkg/macros.h>
+#include <string>
+
+#ifndef APT_10_CLEANER_HEADERS

 #include <apt-pkg/init.h>
 #include <apt-pkg/init.h>

+#endif
+
+class pkgDepCache;
+namespace APT { namespace Progress { class PackageManager; } }

 
 #ifndef APT_8_CLEANER_HEADERS
 using std::vector;
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::vector;


@@ -28,7 +37,7 @@ class pkgDPkgPMPrivate;
 class pkgDPkgPM : public pkgPackageManager
 {
    private:
 class pkgDPkgPM : public pkgPackageManager
 {
    private:

-   pkgDPkgPMPrivate *d;
+   pkgDPkgPMPrivate * const d;

 
    /** \brief record the disappear action and handle accordingly
 
 
    /** \brief record the disappear action and handle accordingly
 


@@ -43,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(std::string const &pkgname);
+   APT_HIDDEN void handleDisappearAction(std::string const &pkgname);

 
    protected:
    int pkgFailures;
 
    protected:
    int pkgFailures;


@@ -82,14 +91,13 @@ class pkgDPkgPM : public pkgPackageManager
 
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);
 
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);

-   __deprecated bool SendV2Pkgs(FILE *F);
+   APT_DEPRECATED_MSG("Use SendPkgInfo with the version as parameter instead") 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 
    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 SetupTerminalScrollArea(int nr_scrolled_rows);

    void SendTerminalProgress(float percentage);
 
    // apport integration
    void SendTerminalProgress(float percentage);
 
    // apport integration


@@ -101,6 +109,9 @@ class pkgDPkgPM : public pkgPackageManager
 
    // helper
    void BuildPackagesProgressMap();
 
    // helper
    void BuildPackagesProgressMap();

+   void StartPtyMagic();
+   void SetupSlavePtyMagic();
+   void StopPtyMagic();

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


@@ -108,19 +119,15 @@ class pkgDPkgPM : public pkgPackageManager
    void DoDpkgStatusFd(int statusfd);
    void ProcessDpkgStatusLine(char *line);
 
    void DoDpkgStatusFd(int statusfd);
    void ProcessDpkgStatusLine(char *line);
 

-   // The Actuall installation implementation
-   virtual bool Install(PkgIterator Pkg,std::string File);
-   virtual bool Configure(PkgIterator Pkg);
-   virtual bool Remove(PkgIterator Pkg,bool Purge = false);
+   // The Actual installation implementation
+   virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
+   virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
+   virtual bool Remove(PkgIterator Pkg,bool Purge = false) APT_OVERRIDE;

 
 

-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
-   virtual bool Go(APT::Progress::PackageManager *progress);
-#else
-   virtual bool Go(int StatusFd=-1);
-   bool GoNoABIBreak(APT::Progress::PackageManager *progress);
-#endif
+   virtual bool Go(APT::Progress::PackageManager *progress) APT_OVERRIDE;
+   virtual bool Go(int StatusFd=-1) APT_OVERRIDE;

 
 

-   virtual void Reset();
+   virtual void Reset() APT_OVERRIDE;

    
    public:
 
    
    public: