* added Debug::pkgDepCache::AutoInstall debug option

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index dd1c794c9912726d9b38d5f6e7e1b644c94aeacb..58d1d25e54ed7c2b633f39d69dee14010773589f 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -16,7 +16,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/algorithms.h>

-    
+#include <apt-pkg/configuration.h>
+

 #include <apti18n.h>    
                                                                        /*}}}*/
 
 #include <apti18n.h>    
                                                                        /*}}}*/
 


@@ -712,6 +713,10 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
         
         if (InstPkg.end() == false)
         {
         
         if (InstPkg.end() == false)
         {

+           if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
+              std::clog << "Installing " << InstPkg.Name() 
+                        << " as dep of " << Pkg.Name() 
+                        << std::endl;

            MarkInstall(InstPkg,true,Depth + 1);
 
            // Set the autoflag, after MarkInstall because MarkInstall unsets it
            MarkInstall(InstPkg,true,Depth + 1);
 
            // Set the autoflag, after MarkInstall because MarkInstall unsets it

diff --git a/configure.in b/configure.in
index f24400ed76d63b5ed09b1096e00cf617cf0a3e03..96adad5974bc944e660db273754614892f95591e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --

-AC_DEFINE_UNQUOTED(VERSION,"0.6.44")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1")

 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 9e851d7533f7ede88e1c2049d9ddb83a56fa2f84..b87e8503049e8ced9ce112aa9a55a57936fb2126 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -244,6 +244,7 @@ DPkg
 Debug 
 {
   pkgProblemResolver "false";
 Debug 
 {
   pkgProblemResolver "false";

+  pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies

   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgDPkgPM "false";
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgDPkgPM "false";