[Aptitude-svn-commit] r3622 - in branches/aptitude-0.3/aptitude: . src/cmdline

[Daniel Burrows]

Author: dburrows
Date: Tue Jul  5 18:16:38 2005
New Revision: 3622

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
Log:
Handle errors encountered while dumping the resolver state better.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jul  5 18:16:38 2005
@@ -1,5 +1,10 @@
 2005-07-05  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_resolver.cc:
+
+	  Display information about what went wrong when there's a problem
+	  writing out a resolver dump.
+
 	* src/generic/aptitude_resolver.h:
 
 	  Don't abort when trying to dump a package that has only one

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	Tue Jul  5 18:16:38 2005
@@ -164,6 +164,9 @@
 	      {
 		aptitude_resolver::solution sol=(*apt_cache_file)->get_current_solution();
 
+		if(_error->PendingError())
+		  _error->DumpErrors();
+
 		if(sol != lastsol)
 		  {
 		    fragment *f=sequence_fragment(flowbox(text_fragment(_("The following actions will resolve these dependencies:"))),
@@ -243,6 +246,8 @@
 			  (*apt_cache_file)->dump_resolver(f);
 			  if(!f)
 			    _error->Errno("dump_resolver", _("Error writing resolver state to %s"), fn.c_str());
+			  else
+			    cout << _("Resolver state successfully written!");
 			}
 		    }
 		    break;