* merged with otavios branch

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

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index d80b231327bee6dea9b31f7f5a31a0b08afc1be2..61c48dcbb6c3869de404057163bdc95f97d70ee6 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -326,10 +326,10 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
 // DPkgPM::Go - Run the sequence                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* This globs the operations and calls dpkg */
-bool pkgDPkgPM::Go()
+bool pkgDPkgPM::Go(int status_fd)
 {
-   unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",350);   
-   unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",8192);
+   unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024);   
+   unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024);
 
    if (RunScripts("DPkg::Pre-Invoke") == false)
       return false;
@@ -367,6 +367,17 @@ bool pkgDPkgPM::Go()
         }       
       }
       
+      // if we got a status_fd argument, we pass it to apt
+      char status_fd_buf[20];
+      if(status_fd > 0) 
+      {
+        Args[n++] = "--status-fd";
+        Size += strlen(Args[n-1]);
+        snprintf(status_fd_buf,20,"%i",status_fd);
+        Args[n++] = status_fd_buf;
+        Size += strlen(Args[n-1]);
+      } 
+
       switch (I->Op)
       {
         case Item::Remove:
@@ -440,7 +451,11 @@ bool pkgDPkgPM::Go()
       sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN);
                     
       // Fork dpkg
-      pid_t Child = ExecFork();
+      pid_t Child;
+      if(status_fd > 0)
+        Child = ExecFork(status_fd);
+      else
+        Child = ExecFork();
             
       // This is the child
       if (Child == 0)