[Aptitude-devel] r2951 - branches/aptitude-0.3/aptitude/src/generic/problemresolver
Daniel Burrows
dburrows@costa.debian.org
Fri, 08 Apr 2005 03:32:49 +0000
Author: dburrows
Date: Fri Apr 8 03:32:48 2005
New Revision: 2951
Modified:
branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Streamline debugging output from the test.
Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h Fri Apr 8 03:32:48 2005
@@ -497,13 +497,9 @@
const version &v,
const dep &d)
{
- std::cout << "Testing whether " << d << " is broken." << std::endl;
-
if(!ver_installed(s, v, d.get_source()))
return false;
- std::cout << "Made it past the vacuity test." << std::endl;
-
// Could be somewhat inefficient for APT; think about how to
// mitigate that by offering higher-level "imagine this situation;
// is this dep broken?" operations in the universe.
@@ -550,41 +546,28 @@
for(typename version::revdep_iterator rd=old_version.revdeps_begin();
rd!=old_version.revdeps_end(); ++rd)
if(dep_broken(s, v, *rd))
- {
- cout << "Inserting broken dep " << *rd << endl;
- new_broken.insert(*rd);
- }
+ new_broken.insert(*rd);
for(typename version::revdep_iterator rd=v.revdeps_begin();
rd!=v.revdeps_end(); ++rd)
if(dep_broken(s, v, *rd))
- {
- cout << "Inserting broken dep " << *rd << endl;
- new_broken.insert(*rd);
- }
+ new_broken.insert(*rd);
const std::set<dep> &old_broken=s.get_broken();
for(typename std::set<dep>::const_iterator bd=old_broken.begin();
bd!=old_broken.end(); ++bd)
if(dep_broken(s, v, *bd))
- {
- cout << "Inserting broken dep " << *bd << endl;
- new_broken.insert(*bd);
- }
+ new_broken.insert(*bd);
solution s2=solution(action(v), s,
new_broken,
new_action_score+broken_score*new_broken.size(),
new_action_score);
- std::cout << " There are " << new_broken.size() << " elements in new_broken." << std::endl;
-
std::cout << "Enqueuing ";
s2.dump(std::cout);
std::cout << endl;
- std::cout << " There are " << new_broken.size() << " elements in new_broken." << std::endl;
-
open.push(s2);
}
@@ -608,7 +591,7 @@
vi!=source_package.versions_end(); ++vi)
if(*vi != source_version)
{
- std::cout << "Trying to resolve " << d << " by installing " << (*vi).get_package().get_name() << " version " << (*vi).get_name() << std::endl;
+ std::cout << " Trying to resolve " << d << " by installing " << (*vi).get_package().get_name() << " version " << (*vi).get_name() << std::endl;
try_install(s, *vi);
}
}
@@ -620,7 +603,7 @@
for(typename dep::solver_iterator si=d.solvers_begin();
si!=d.solvers_end(); ++si)
{
- std::cout << "Trying to resolve " << d << " by installing " << (*si).get_package().get_name() << " version " << (*si).get_name() << std::endl;
+ std::cout << " Trying to resolve " << d << " by installing " << (*si).get_package().get_name() << " version " << (*si).get_name() << std::endl;
try_install(s, *si);
}
}
@@ -721,7 +704,7 @@
solution s=open.top();
open.pop();
- std::cout << "Trying ";
+ std::cout << "Processing ";
s.dump(std::cout);