Change history branch so that it does not break the

apt ABI for the pkgPackageManager interface
(can be reverted on the next ABI break)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 2f84a5a879557955ad73a5b6a95efd767c8df516..e928776af985310f1225ec4abaf30612edc34991 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -562,7 +562,7 @@ void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd)
 }
                                                                        /*}}}*/
 // DPkgPM::WriteHistoryTag                                             /*{{{*/
 }
                                                                        /*}}}*/
 // DPkgPM::WriteHistoryTag                                             /*{{{*/

-void pkgDPkgPM::WriteHistoryTag(string tag, string value)
+void pkgDPkgPM::WriteHistoryTag(FILE *history_out, string tag, string value)

 {
    if (value.size() > 0)
    {
 {
    if (value.size() > 0)
    {


@@ -602,7 +602,7 @@ bool pkgDPkgPM::OpenLog()
                                   _config->Find("Dir::Log::History"));
    if (!history_name.empty())
    {
                                   _config->Find("Dir::Log::History"));
    if (!history_name.empty())
    {

-      history_out = fopen(history_name.c_str(),"a");
+      FILE *history_out = fopen(history_name.c_str(),"a");

       chmod(history_name.c_str(), 0644);
       fprintf(history_out, "\nStart-Date: %s\n", timestr);
       string remove, purge, install, upgrade, downgrade;
       chmod(history_name.c_str(), 0644);
       fprintf(history_out, "\nStart-Date: %s\n", timestr);
       string remove, purge, install, upgrade, downgrade;


@@ -622,12 +622,12 @@ bool pkgDPkgPM::OpenLog()
               remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), ");     
         }
       }
               remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), ");     
         }
       }

-      WriteHistoryTag("Install", install);
-      WriteHistoryTag("Upgrade", upgrade);
-      WriteHistoryTag("Downgrade",downgrade);
-      WriteHistoryTag("Remove",remove);
-      WriteHistoryTag("Purge",purge);
-      fflush(history_out);
+      WriteHistoryTag(history_out, "Install", install);
+      WriteHistoryTag(history_out, "Upgrade", upgrade);
+      WriteHistoryTag(history_out, "Downgrade",downgrade);
+      WriteHistoryTag(history_out, "Remove",remove);
+      WriteHistoryTag(history_out, "Purge",purge);
+      fclose(history_out);

    }
    
    return true;
    }
    
    return true;


@@ -650,10 +650,11 @@ bool pkgDPkgPM::CloseLog()
    }
    term_out = NULL;
 
    }
    term_out = NULL;
 

-   if(history_out)
+   string history_name = flCombine(_config->FindDir("Dir::Log"),
+                                  _config->Find("Dir::Log::History"));
+   if (!history_name.empty())

    {
    {

-      if (dpkg_error.size() > 0)
-        fprintf(history_out, "Error: %s\n", dpkg_error.c_str());
+      FILE *history_out = fopen(history_name.c_str(),"a");

       fprintf(history_out, "End-Date: %s\n", timestr);
       fclose(history_out);
    }
       fprintf(history_out, "End-Date: %s\n", timestr);
       fclose(history_out);
    }


@@ -1125,6 +1126,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
         if(stopOnError)
            RunScripts("DPkg::Post-Invoke");
 
         if(stopOnError)
            RunScripts("DPkg::Post-Invoke");
 

+        string dpkg_error;

         if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 
            strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
         else if (WIFEXITED(Status) != 0)
         if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 
            strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
         else if (WIFEXITED(Status) != 0)


@@ -1133,7 +1135,17 @@ bool pkgDPkgPM::Go(int OutStatusFd)
            strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
 
         if(dpkg_error.size() > 0)
            strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
 
         if(dpkg_error.size() > 0)

+        {

            _error->Error(dpkg_error.c_str());
            _error->Error(dpkg_error.c_str());

+           string history_name = flCombine(_config->FindDir("Dir::Log"),
+                                           _config->Find("Dir::Log::History"));
+           if (!history_name.empty())
+           {
+              FILE *history_out = fopen(history_name.c_str(),"a");
+              fprintf(history_out, "Error: %s\n", dpkg_error.c_str());
+              fclose(history_out);
+           }
+        }

 
         if(stopOnError) 
         {
 
         if(stopOnError) 
         {

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index ce3e20f2e91e57b9620855d4e6044928cecd9423..160486bf9aba2c24d21cf5400799b0ce0e12e4c0 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -29,8 +29,6 @@ class pkgDPkgPM : public pkgPackageManager
    char dpkgbuf[1024];
    int dpkgbuf_pos;
    FILE *term_out;
    char dpkgbuf[1024];
    int dpkgbuf_pos;
    FILE *term_out;

-   FILE *history_out;
-   string dpkg_error;

 
    protected:
    int pkgFailures;
 
    protected:
    int pkgFailures;


@@ -70,7 +68,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 tag, string value);
+   void WriteHistoryTag(FILE* history_out, string tag, string value);

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index af1476b7ad82b94ad6399fcac4b8ba8013e523d2..44f5d5ef74eebd28039b68d1957817f06d9700ae 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -49,7 +49,11 @@ class pkgPackageManager : protected pkgCache::Namespace
    bool Debug;
          
    bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);
    bool Debug;
          
    bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);

-   void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth = 0);
+   // binary-compat change, fix on next abi break
+   void ImmediateAdd(PkgIterator P, bool UseInstallVer) {
+      ImmediateAdd(P, UseInstallVer, 0);
+   }
+   void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth);

    virtual OrderResult OrderInstall();
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
    bool CreateOrderList();
    virtual OrderResult OrderInstall();
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
    bool CreateOrderList();

diff --git a/debian/changelog b/debian/changelog
index e6afafe99a26274cd3c4287b8323602aebfbf53e..9615201b238d3c0b5c941857714026e8f31a8b44 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.7.25ubuntu2) lucid; urgency=low
+
+  * Change history branch so that it does not break the 
+    apt ABI for the pkgPackageManager interface
+    (can be reverted on the next ABI break)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Dec 2009 10:14:16 +0100
+

 apt (0.7.25ubuntu1) lucid; urgency=low
 
   * Merged from the mvo branch
 apt (0.7.25ubuntu1) lucid; urgency=low
 
   * Merged from the mvo branch