merged from debian

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index debde36a30d4045b7c9990c345215b6a280b32df..90e5b95e6c5ca303fb9bb752ab84f98c0f05359c 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -23,6 +23,8 @@ class pkgDPkgPM : public pkgPackageManager
 {
    private:
 
 {
    private:
 

+   bool stdin_is_dev_null;
+

    // 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;


@@ -46,13 +48,14 @@ class pkgDPkgPM : public pkgPackageManager
    // 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;
    // 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;

+

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

       string File;
       PkgIterator Pkg;
       Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op),
       string File;
       PkgIterator Pkg;
       Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op),


@@ -63,13 +66,16 @@ class pkgDPkgPM : public pkgPackageManager
    vector<Item> List;
 
    // Helpers
    vector<Item> List;
 
    // Helpers

-   bool RunScripts(const char *Cnf);

    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 
    // apport integration
    void WriteApportReport(const char *pkgpath, const char *errormsg);
 
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
 
    // apport integration
    void WriteApportReport(const char *pkgpath, const char *errormsg);
 

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

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