* merge the remaining Ubuntu change:

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

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 18c731788f2a3a020f07dcf80d138334248fb898..c724c69a942d82f40378badf5183e491f855fa24 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -52,6 +52,7 @@ namespace
     std::make_pair("configure", N_("Configuring %s")),
     std::make_pair("remove",    N_("Removing %s")),
     std::make_pair("purge",    N_("Completely removing %s")),
+    std::make_pair("disappear", N_("Noting disappearance of %s")),
     std::make_pair("trigproc",  N_("Running post-installation trigger %s"))
   };
 
@@ -107,7 +108,7 @@ ionice(int PID)
 /* */
 pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
    : pkgPackageManager(Cache), dpkgbuf_pos(0),
-     term_out(NULL), PackagesDone(0), PackagesTotal(0), pkgFailures(0)
+     term_out(NULL), history_out(NULL), PackagesDone(0), PackagesTotal(0)
 {
 }
                                                                        /*}}}*/
@@ -126,7 +127,19 @@ bool pkgDPkgPM::Install(PkgIterator Pkg,string File)
    if (File.empty() == true || Pkg.end() == true)
       return _error->Error("Internal Error, No file name for %s",Pkg.Name());
 
-   List.push_back(Item(Item::Install,Pkg,File));
+   // If the filename string begins with DPkg::Chroot-Directory, return the
+   // substr that is within the chroot so dpkg can access it.
+   string const chrootdir = _config->FindDir("DPkg::Chroot-Directory","/");
+   if (chrootdir != "/" && File.find(chrootdir) == 0)
+   {
+      size_t len = chrootdir.length();
+      if (chrootdir.at(len - 1) == '/')
+        len--;
+      List.push_back(Item(Item::Install,Pkg,File.substr(len)));
+   }
+   else
+      List.push_back(Item(Item::Install,Pkg,File));
+
    return true;
 }
                                                                        /*}}}*/
@@ -408,7 +421,8 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
       'processing: install: pkg'
       'processing: configure: pkg'
       'processing: remove: pkg'
-      'processing: purge: pkg' - but for apt is it a ignored "unknown" action
+      'processing: purge: pkg'
+      'processing: disappear: pkg'
       'processing: trigproc: trigger'
            
    */
@@ -455,6 +469,9 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
         write(OutStatusFd, status.str().c_str(), status.str().size());
       if (Debug == true)
         std::clog << "send: '" << status.str() << "'" << endl;
+
+      if (strncmp(action, "disappear", strlen("disappear")) == 0)
+        disappearedPkgs.insert(string(pkg_or_trigger));
       return;
    }
 
@@ -562,7 +579,7 @@ void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd)
 }
                                                                        /*}}}*/
 // DPkgPM::WriteHistoryTag                                             /*{{{*/
-void pkgDPkgPM::WriteHistoryTag(FILE *history_out, string tag, string value)
+void pkgDPkgPM::WriteHistoryTag(string tag, string value)
 {
    if (value.size() > 0)
    {
@@ -603,7 +620,7 @@ bool pkgDPkgPM::OpenLog()
                                   _config->Find("Dir::Log::History"));
    if (!history_name.empty())
    {
-      FILE *history_out = fopen(history_name.c_str(),"a");
+      history_out = fopen(history_name.c_str(),"a");
       if (history_out == NULL)
         return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str());
       chmod(history_name.c_str(), 0644);
@@ -625,12 +642,14 @@ bool pkgDPkgPM::OpenLog()
               remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), ");     
         }
       }
-      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);
+      if (_config->Exists("Commandline::AsString") == true)
+        WriteHistoryTag("Commandline", _config->Find("Commandline::AsString"));
+      WriteHistoryTag("Install", install);
+      WriteHistoryTag("Upgrade", upgrade);
+      WriteHistoryTag("Downgrade",downgrade);
+      WriteHistoryTag("Remove",remove);
+      WriteHistoryTag("Purge",purge);
+      fflush(history_out);
    }
    
    return true;
@@ -653,14 +672,14 @@ bool pkgDPkgPM::CloseLog()
    }
    term_out = NULL;
 
-   string history_name = flCombine(_config->FindDir("Dir::Log"),
-                                  _config->Find("Dir::Log::History"));
-   if (!history_name.empty())
+   if(history_out)
    {
-      FILE *history_out = fopen(history_name.c_str(),"a");
+      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);
    }
+   history_out = NULL;
 
    return true;
 }
@@ -908,6 +927,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
         {
            if((*I).Pkg.end() == true)
               continue;
+           if (I->Op == Item::Configure && disappearedPkgs.find(I->Pkg.Name()) != disappearedPkgs.end())
+              continue;
            Args[n++] = I->Pkg.Name();
            Size += strlen(Args[n-1]);
         }       
@@ -1075,9 +1096,10 @@ bool pkgDPkgPM::Go(int OutStatusFd)
            signal(SIGHUP,old_SIGHUP);
            return _error->Errno("waitpid","Couldn't wait for subprocess");
         }
+
         // wait for input or output here
         FD_ZERO(&rfds);
-        if (!stdin_is_dev_null)
+        if (master >= 0 && !stdin_is_dev_null)
            FD_SET(0, &rfds); 
         FD_SET(_dpkgin, &rfds);
         if(master >= 0)
@@ -1130,7 +1152,6 @@ bool pkgDPkgPM::Go(int OutStatusFd)
         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)
@@ -1139,17 +1160,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
            strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
 
         if(dpkg_error.size() > 0)
-        {
            _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) 
         {
@@ -1184,7 +1195,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
    string::size_type pos;
    FILE *report;
 
-   if (_config->FindB("Dpkg::ApportFailureReport",true) == false)
+   if (_config->FindB("Dpkg::ApportFailureReport", false) == false)
    {
       std::clog << "configured to not write apport reports" << std::endl;
       return;