* apt-pkg/deb/dpkgpm.cc:

  - added "Dpkg::StopOnError" variable that controls if apt
      will abort on errors from dpkg

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index c7a6b921f0d4af7b29b705de1e47aee6e4e50944..3204fc1bb22502d82c8dd97347244457fb9939f4 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -711,14 +711,23 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       // Check for an error code.
       if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
       {
       // Check for an error code.
       if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
       {

-        RunScripts("DPkg::Post-Invoke");
-        if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV)
-           return _error->Error("Sub-process %s received a segmentation fault.",Args[0]);
-
-        if (WIFEXITED(Status) != 0)
-           return _error->Error("Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
+        // if it was set to "keep-dpkg-runing" then we won't return
+        // here but keep the loop going and just report it as a error
+        // for later
+        bool stopOnError = _config->FindB("Dpkg::StopOnError",true);

         
         

-        return _error->Error("Sub-process %s exited unexpectedly",Args[0]);
+        if(stopOnError)
+           RunScripts("DPkg::Post-Invoke");
+
+        if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 
+           _error->Error("Sub-process %s received a segmentation fault.",Args[0]);
+        else if (WIFEXITED(Status) != 0)
+           _error->Error("Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
+        else 
+           _error->Error("Sub-process %s exited unexpectedly",Args[0]);
+
+        if(stopOnError)
+           return false;

       }      
    }
 
       }      
    }
 

diff --git a/debian/changelog b/debian/changelog
index 24e10dcd5465f525e7b98276ee344e639753c907..8da0d6471741527fe6b9ceb77fbc9edb50363293 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 apt (0.6.46.4) unstable; urgency=low
 
 apt (0.6.46.4) unstable; urgency=low
 

-  * add apt-secure.8 to "See also" section
+  * added apt-secure.8 to "See also" section
+  * apt-pkg/deb/dpkgpm.cc:
+    - added "Dpkg::StopOnError" variable that controls if apt
+      will abort on errors from dpkg

 
  --
 
 
  --
 

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 0f0abc30c9028365104b6576a4cc6a7ad00dd5ee..73e20aa435c7be50c4871cd7b7bf154e05c9640b 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -237,6 +237,10 @@ DPkg
    // Control the size of the command line passed to dpkg.
    MaxBytes 1024;
    MaxArgs 350;
    // Control the size of the command line passed to dpkg.
    MaxBytes 1024;
    MaxArgs 350;

+
+   // controls if apt will apport on the first dpkg error or if it 
+   // tries to install as many packages as possible
+   StopOnError "true";

 }
 
 /* Options you can set to see some debugging text They correspond to names
 }
 
 /* Options you can set to see some debugging text They correspond to names