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

[Daniel Burrows]

Author: dburrows
Date: Fri Aug 19 20:06:01 2005
New Revision: 3924

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
Log:
Fix how version acceptance works from the command line.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Aug 19 20:06:01 2005
@@ -1,5 +1,10 @@
 2005-08-19  Daniel Burrows  <dburrows at debian.org>
 
+	* src/cmdline/cmdline_resolver.cc:
+
+	  Fix the messages displayed when accepting a version, and
+	  actually accept it!
+
 	* src/generic/aptitude_resolver_universe.cc, src/generic/aptitude_resolver_universe.h, src/generic/problemresolver/dummy_universe.cc, src/generic/problemresolver/dummy_universe.h, src/generic/problemresolver/problemresolver.h:
 
 	  Redefine acceptedness of versions: instead of rejecting all

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	Fri Aug 19 20:06:01 2005
@@ -321,7 +321,7 @@
 				 pkg.Name(), ver.get_ver().VerStr(),
 				 archives_text(ver.get_ver()).c_str()) << endl;
 
-	      (*apt_cache_file)->resolver_unmandate_version(ver);
+	      (*apt_cache_file)->resolver_mandate_version(ver);
 	    }
 	}
     }
@@ -415,7 +415,7 @@
 		    reject_or_mandate_version(string(response, 1), true);
 		    break;
 		  case 'A':
-		    reject_or_mandate_version(string(response, 1), true);
+		    reject_or_mandate_version(string(response, 1), false);
 		    break;
 		  case '.':
 		    (*apt_cache_file)->next_solution();