From 987d8d0315a315c74827ee2160671a30f5bc4e14 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 12 Aug 2011 12:22:17 +0100 Subject: Inproved debug with versioning --- apt-pkg/packagemanager.cc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 2fe98b101..8fc571f2f 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -320,9 +320,11 @@ bool pkgPackageManager::ConfigureAll() only shown when debuging*/ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg) { - if (Debug) - clog << "SmartConfigure " << Pkg.Name() << endl; - + if (Debug) { + VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer); + clog << "SmartConfigure " << Pkg.Name() << InstallVer.VerStr() << endl; + } + VerIterator const instVer = Cache[Pkg].InstVerIter(Cache); /* Because of the ordered list, most dependancies should be unpacked, @@ -513,8 +515,14 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) } bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate) { - if (Debug) - clog << "SmartUnPack " << Pkg.Name() << endl; + if (Debug) { + clog << "SmartUnPack " << Pkg.Name(); + VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer); + if (Pkg.CurrentVer() == 0) + cout << "(install version " << InstallVer.VerStr() << ")" << endl; + else + cout << "(replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")" << endl; + } // Check if it is already unpacked if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && -- cgit v1.2.3