add /var/log/apt/history.log file

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 6eb3b40acf7e5b862754f5ee65c2edc8262f1491..480ffd169253fb810018fb98522590e9c95e56f1 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -556,39 +556,90 @@ bool pkgDPkgPM::OpenLog()
    string logdir = _config->FindDir("Dir::Log");
    if(not FileExists(logdir))
       return _error->Error(_("Directory '%s' missing"), logdir.c_str());
    string logdir = _config->FindDir("Dir::Log");
    if(not FileExists(logdir))
       return _error->Error(_("Directory '%s' missing"), logdir.c_str());

+
+   // get current time
+   char timestr[200];
+   time_t t = time(NULL);
+   struct tm *tmp = localtime(&t);
+   strftime(timestr, sizeof(timestr), "%F  %T", tmp);
+
+   // open terminal log

    string logfile_name = flCombine(logdir,
                                   _config->Find("Dir::Log::Terminal"));
    if (!logfile_name.empty())
    {
       term_out = fopen(logfile_name.c_str(),"a");
       chmod(logfile_name.c_str(), 0600);
    string logfile_name = flCombine(logdir,
                                   _config->Find("Dir::Log::Terminal"));
    if (!logfile_name.empty())
    {
       term_out = fopen(logfile_name.c_str(),"a");
       chmod(logfile_name.c_str(), 0600);

-      // output current time
-      char outstr[200];
-      time_t t = time(NULL);
-      struct tm *tmp = localtime(&t);
-      strftime(outstr, sizeof(outstr), "%F  %T", tmp);
-      fprintf(term_out, "\nLog started: ");
-      fprintf(term_out, "%s", outstr);
+      fprintf(term_out, "\n\nLog started: ");
+      fprintf(term_out, "%s", timestr);

       fprintf(term_out, "\n");
    }
       fprintf(term_out, "\n");
    }

+
+   // write 
+   string history_name = flCombine(logdir,
+                                  _config->Find("Dir::Log::History"));
+   if (!history_name.empty())
+   {
+      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;
+      for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
+      {
+        if (Cache[I].Install())
+           install += I.Name() + string(" (") + Cache[I].CandVersion + string(") ");
+        else if (Cache[I].Delete())
+        {
+           if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge)
+              purge += I.Name() + string(" (") + Cache[I].CurVersion + string(") ");       
+           else
+              remove += I.Name() + string(" (") + Cache[I].CurVersion + string(") ");      
+        }
+        else if (Cache[I].Upgrade())
+           upgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string(") ");
+        else if (Cache[I].Downgrade())
+           downgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string(") ");
+      }
+      if (install.size() > 0)
+        fprintf(history_out, "Install: %s\n", install.c_str());
+      if (upgrade.size() > 0)
+        fprintf(history_out, "Upgrade: %s\n", upgrade.c_str());
+      if (downgrade.size() > 0)
+        fprintf(history_out, "Downgrade: %s\n", downgrade.c_str());
+      if (remove.size() > 0)
+        fprintf(history_out, "Remove: %s\n", remove.c_str());
+      if (purge.size() > 0)
+        fprintf(history_out, "Purge: %s\n", purge.c_str());
+   }
+   

    return true;
 }
                                                                        /*}}}*/
 // DPkg::CloseLog                                                      /*{{{*/
 bool pkgDPkgPM::CloseLog()
 {
    return true;
 }
                                                                        /*}}}*/
 // DPkg::CloseLog                                                      /*{{{*/
 bool pkgDPkgPM::CloseLog()
 {

+   char timestr[200];
+   time_t t = time(NULL);
+   struct tm *tmp = localtime(&t);
+   strftime(timestr, sizeof(timestr), "%F  %T", tmp);
+

    if(term_out)
    {
    if(term_out)
    {

-      char outstr[200];
-      time_t t = time(NULL);
-      struct tm *tmp = localtime(&t);
-      strftime(outstr, sizeof(outstr), "%F  %T", tmp);

       fprintf(term_out, "Log ended: ");
       fprintf(term_out, "Log ended: ");

-      fprintf(term_out, "%s", outstr);
+      fprintf(term_out, "%s", timestr);

       fprintf(term_out, "\n");
       fclose(term_out);
    }
    term_out = NULL;
       fprintf(term_out, "\n");
       fclose(term_out);
    }
    term_out = NULL;

+
+   if(history_out)
+   {
+      if (dpkg_error.size() > 0)
+        fprintf(history_out, "Error: %s\n", dpkg_error.c_str());
+      fprintf(history_out, "End-Date: %s\n", timestr);
+      fclose(history_out);
+   }
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -1057,11 +1108,14 @@ bool pkgDPkgPM::Go(int OutStatusFd)
            RunScripts("DPkg::Post-Invoke");
 
         if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 
            RunScripts("DPkg::Post-Invoke");
 
         if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 

-           _error->Error("Sub-process %s received a segmentation fault.",Args[0]);
+           strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);

         else if (WIFEXITED(Status) != 0)
         else if (WIFEXITED(Status) != 0)

-           _error->Error("Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
+           strprintf(dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));

         else 
         else 

-           _error->Error("Sub-process %s exited unexpectedly",Args[0]);
+           strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
+
+        if(dpkg_error.size() > 0)
+           _error->Error(dpkg_error.c_str());

 
         if(stopOnError) 
         {
 
         if(stopOnError) 
         {

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 43e5c7d45df21d251923233c2e02e0e68f66d865..67f1430be5467bfb4e7c1771ffa8c2c60b0cf766 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -29,7 +29,9 @@ 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:
 
    // progress reporting
    protected:
 
    // progress reporting

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index a54c09a3613d2c7edaa7f54fb6c6f12a94b9f61e..2544b8025a8218d3584f2f1ca2853ebb38a02c35 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -74,6 +74,7 @@ bool pkgInitConfig(Configuration &Cnf)
    // State   
    Cnf.Set("Dir::Log","var/log/apt");
    Cnf.Set("Dir::Log::Terminal","term.log");
    // State   
    Cnf.Set("Dir::Log","var/log/apt");
    Cnf.Set("Dir::Log::Terminal","term.log");

+   Cnf.Set("Dir::Log::History","history.log");

 
    // Translation
    Cnf.Set("APT::Acquire::Translation", "environment");
 
    // Translation
    Cnf.Set("APT::Acquire::Translation", "environment");