From d4c5f11f8ef619ec56ae1e532416bb3817442b1c Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Sat, 27 May 2006 14:13:31 +0200
Subject: * added Debug::pkgDepCache::AutoInstall debug option

---
 apt-pkg/depcache.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index dd1c794c9..58d1d25e5 100644
--- 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/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
-- 
cgit v1.2.3


From c08447c8eef91499920ca51276313526888939ec Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 9 Jun 2006 15:47:50 +0200
Subject: * merge the patch from Steinar

---
 apt-pkg/tagfile.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index dc1ba3f9e..9763d96a3 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -98,7 +98,7 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
    iOffset = Offset;
    Start = Buffer + iOffset;
    
-   if (Tag.Scan(Start,End - Start) == false)
+   if (Start != End && Tag.Scan(Start,End - Start) == false)
       return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
    
    return true;
-- 
cgit v1.2.3