releasing version 0.8.16~exp4

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

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 62d3d893d8e0660e343412b081c6b11c5b5a2e3e..ddf9485c746d2d9f9a0f949a815d07a1b46fa72e 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -18,18 +18,28 @@
 using std::vector;
 using std::map;
 
 using std::vector;
 using std::map;
 

+class pkgDPkgPMPrivate;

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

+   pkgDPkgPMPrivate *d;
+
+   /** \brief record the disappear action and handle accordingly
+
+      dpkg let packages disappear then they have no files any longer and
+      nothing depends on them. We need to collect this as dpkg as well as
+      APT doesn't know beforehand that the package will disappear, so the
+      only possible option is to tell the user afterwards about it.
+      To enhance the experience we also try to forward the auto-install
+      flag so the disappear-causer(s) are not autoremoved next time -
+      for the transfer to happen the disappeared version needs to depend
+      on the package the flag should be forwarded to and this package
+      needs to declare a Replaces on the disappeared package.
+      \param pkgname Name of the package that disappeared
+   */
+   void handleDisappearAction(string const &pkgname);

 
 

-   bool stdin_is_dev_null;
-
-   // the buffer we use for the dpkg status-fd reading
-   char dpkgbuf[1024];
-   int dpkgbuf_pos;
-   FILE *term_out;
-   

    protected:
    int pkgFailures;
 
    protected:
    int pkgFailures;
 


@@ -49,18 +59,13 @@ class pkgDPkgPM : public pkgPackageManager
    // going to be install is already in state "half-installed")
    map<string,unsigned int> PackageOpsDone;
 
    // going to be install is already in state "half-installed")
    map<string,unsigned int> PackageOpsDone;
 

-
-#if 1 // FIXME: BINARY COMPATIBILITY ONLY, remove on next ABI break
-   map<string,string> PackageProcessingOps;
-#endif
-

    // 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),


@@ -73,6 +78,7 @@ class pkgDPkgPM : public pkgPackageManager
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);

+   void WriteHistoryTag(string const &tag, string value);

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