* merged from apt--mvo

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 065c6c917858a34df92c4a31e6acbfa794318b3b..debde36a30d4045b7c9990c345215b6a280b32df 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -26,8 +26,10 @@ class pkgDPkgPM : public pkgPackageManager
    // the buffer we use for the dpkg status-fd reading
    char dpkgbuf[1024];
    int dpkgbuf_pos;
    // 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 


@@ -65,9 +67,12 @@ class pkgDPkgPM : public pkgPackageManager
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 

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

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

-   void DoTerminalPty(int master, FILE *out);
+   void DoTerminalPty(int master);

    void DoDpkgStatusFd(int statusfd, int OutStatusFd);
    void ProcessDpkgStatusLine(int OutStatusFd, char *line);
 
    void DoDpkgStatusFd(int statusfd, int OutStatusFd);
    void ProcessDpkgStatusLine(int OutStatusFd, char *line);