[Aptitude-svn-commit] r3937 - in branches/aptitude-0.3/aptitude: .
src/generic/problemresolver
Daniel Burrows
dburrows at costa.debian.org
Sat Aug 20 18:38:17 UTC 2005
Author: dburrows
Date: Sat Aug 20 18:38:13 2005
New Revision: 3937
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Tweak debug output.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sat Aug 20 18:38:13 2005
@@ -2,6 +2,12 @@
* src/generic/problemresolver/problemresolver.h:
+ Don't spew quite so much in debug mode when checking for
+ conflicts, and add a note about how long the search took when it
+ fails.
+
+ * src/generic/problemresolver/problemresolver.h:
+
When checking whether a solution is irrelevant, also check
whether it contains a known conflict.
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 Sat Aug 20 18:38:13 2005
@@ -511,14 +511,6 @@
m[p] = a;
- if(debug)
- {
- std::cout << "Checking for conflicts in temporary solution:" << std::endl;
- dump(std::cout, m);
- std::cout << std::endl;
- }
-
-
typename std::set<std::map<package, act_conflict> >::const_iterator
result = subsumes_any_conflict(m);
@@ -2368,6 +2360,10 @@
assert(open.empty());
finished=true;
+
+ if(debug)
+ std::cout << " *** Out of solutions after " << odometer << " steps." << std::endl;
+
throw NoMoreSolutions();
}
More information about the Aptitude-svn-commit
mailing list