diff options
| author | Michael Vogt <egon@bottom> | 2006-06-09 15:48:40 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2006-06-09 15:48:40 +0200 |
| commit | ab1bdcf7fb907555ee2c42430eaed51feba6910c (patch) | |
| tree | bc16a85c6cc668debe3c8f37bddb70b6b97c78b9 /apt-pkg | |
| parent | 8c64fc132ce0743f02b4d7216a3646a8fb93d8b6 (diff) | |
| parent | c08447c8eef91499920ca51276313526888939ec (diff) | |
* merged from mainline
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/depcache.cc | 7 | ||||
| -rw-r--r-- | apt-pkg/tagfile.cc | 2 |
2 files changed, 7 insertions, 2 deletions
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 diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index fc020436c..426174eb1 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; |