[Aptitude-devel] r3255 - in branches/aptitude-0.3/aptitude: . src/cmdline

[Daniel Burrows]

Author: dburrows
Date: Mon May  2 02:18:06 2005
New Revision: 3255

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
Log:
Properly handle 'n' at the 'more time?' prompt.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon May  2 02:18:06 2005
@@ -1,5 +1,10 @@
 2005-05-01  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_resolver.cc:
+
+	Give up, don't loop forever, if the user asks to terminate a
+	search.
+
 	* src/generic/aptcache.cc:
 
 	Bump the default StepLimit to 500, to deal with the fact that some

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	Mon May  2 02:18:06 2005
@@ -282,8 +282,8 @@
 			// NoMoreExceptions flows to the outer catch.
 			break;
 		      case 'N':
-			done=true;
-			break;
+			cout << _("Abandoning all efforts to resolve these dependencies.") << endl;
+			return false;
 		      default:
 			cout << _("Invalid response; please enter 'y' or 'n'.") << endl;
 		      }