Просмотр исходного кода

* added Debug::pkgDepCache::AutoInstall debug option

Michael Vogt лет назад: 20
Родитель
Сommit
d4c5f11f8e
3 измененных файлов с 8 добавлено и 2 удалено
  1. 6 1
      apt-pkg/depcache.cc
  2. 1 1
      configure.in
  3. 1 0
      doc/examples/configure-index

+ 6 - 1
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/configuration.h>
+
 #include <apti18n.h>    
 									/*}}}*/
 
@@ -712,6 +713,10 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	 
 	 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

+ 1 - 1
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_DEFINE_UNQUOTED(VERSION,"0.6.44")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

+ 1 - 0
doc/examples/configure-index

@@ -244,6 +244,7 @@ DPkg
 Debug 
 {
   pkgProblemResolver "false";
+  pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgDPkgPM "false";