More debug info

4 files changed, 23 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c24dcde..c807f11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ include( FindDoxygen )
 
 add_custom_target( unit )
 
-set( EPT_VERSION "1.0.2+test2" )
+set( EPT_VERSION "1.0.2+test3" )
 set( APT_INCLUDES "/usr/include/" CACHE STRING "apt include path" )
 set( APT_LINKDIRS "/usr/lib/" CACHE STRING "apt library path" )
 set( OPT_FLAGS "-O0 -g" CACHE STRING "optimization level" )
diff --git a/debian/changelog b/debian/changelog
index 4161bde..a0046ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libept (1.0.2+test3) experimental; urgency=low
+
+  * More debug info
+
+ -- Enrico Zini <enrico@debian.org>  Thu, 15 Jul 2010 11:57:35 +0100
+
 libept (1.0.2+test2) experimental; urgency=low
 
   * More debugging prints, and removed a useless constructor
diff --git a/ept/CMakeLists.txt b/ept/CMakeLists.txt
index ed9b6c7..8965407 100644
--- a/ept/CMakeLists.txt
+++ b/ept/CMakeLists.txt
@@ -57,6 +57,12 @@ string( REPLACE "\n" "" ARCH "${ARCH}" )
 
 add_custom_command(
   OUTPUT ${datastamp}
+  COMMAND echo "Apt config"
+  COMMAND apt-config dump
+  COMMAND echo -n "Dumpavail count: "
+  COMMAND apt-cache dumpavail |grep -c ^Package
+  COMMAND echo -n "Installed count: "
+  COMMAND dpkg -l |grep -c ^ii
   COMMAND mkdir -p test-env/etc test-env/state/lists/partial
 		           test-env/cache test-env/debtags
 			   test-env/cache/archives/partial test-env/desktop
diff --git a/ept/apt/apt.cc b/ept/apt/apt.cc
index 64a3bab..342190e 100644
--- a/ept/apt/apt.cc
+++ b/ept/apt/apt.cc
@@ -191,11 +191,10 @@ cerr << "RIImpl PC " << apt.cache().HeaderP->PackageCount + 1 << endl;
 		// Populate the vector of versions to print
 		for (pkgCache::PkgIterator pi = apt.cache().PkgBegin(); !pi.end(); ++pi)
 		{    
-cerr << "RIImpl HASPKG" << endl;
+cerr << "RIImpl HASPKG " << pi.Name() << endl;
 			if (pi->VersionList == 0)
 				continue;
 
-cerr << "RIImpl HASVER" << endl;
 			/* Get the candidate version or fallback on the installed version,
 			 * as usual */
 			pkgCache::VerIterator vi = apt.policy().GetCandidateVer(pi);
@@ -206,19 +205,18 @@ cerr << "RIImpl HASVER" << endl;
 				vi = pi.CurrentVer();
 			}
 
-cerr << "RIImpl CHOSENVER" << endl;
+cerr << "RIImpl  CHOSENVER " << (vi.VerStr() ? vi.VerStr() : "(null)") << " FOR " << (vi.Arch() ? vi.Arch() : "(null)") << endl;
 			// Choose a valid file that contains the record for this version
 			pkgCache::VerFileIterator vfi = vi.FileList();
 			for ( ; !vfi.end(); ++vfi)
 				if ((vfi.File()->Flags & pkgCache::Flag::NotSource) == 0)
 					break;
 
-cerr << "RIImpl ASKEDFILE" << endl;
 			// Handle packages whose candidate version is currently installed
 			// from outside the archives (like from a locally built .deb
 			if (vfi.end() == true)
 			{
-cerr << "RIImpl LOCALPKG" << endl;
+cerr << "RIImpl  LOCALPKG" << endl;
 				for (pkgCache::VerIterator cur = pi.VersionList(); cur.end() != true; cur++)
 				{
 					for (vfi = cur.FileList(); vfi.end() == false; vfi++)
@@ -234,8 +232,15 @@ cerr << "RIImpl LOCALPKG" << endl;
 						break;
 				}
 			}
+			else
+/**/				cerr << "RIImpl  HASFILE" << endl;
 			if (!vfi.end())
+			{
 				vflist.push_back(vfi);
+/**/				cerr << "RIImpl  TAKEN" << endl;
+			}
+			else
+/**/				cerr << "RIImpl  SKIPPED" << endl;
 		}
 
 		cerr << vflist.size() << " versions found" << endl;