[Aptitude-svn-commit] r4307 - in branches/aptitude-0.3/aptitude: . doc/en src

[Daniel Burrows]

Author: dburrows
Date: Mon Sep 26 22:17:57 2005
New Revision: 4307

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
   branches/aptitude-0.3/aptitude/src/pkg_item.cc
Log:
Make the interactive 'keep', and only the interactive 'keep',
clear the hold status of packages.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Sep 26 22:17:57 2005
@@ -1,5 +1,11 @@
 2005-09-26  Daniel Burrows  <dburrows at debian.org>
 
+	* src/pkg_item.cc:
+
+	  Make the interactive 'keep' command cancel any hold set on a
+	  package; the behavior at the command line is unchanged.
+	  (Closes: #326949)
+
 	* src/generic/apt/aptcache.cc:
 
 	  Preserve the last version of pkgstates when saving the selection

Modified: branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	(original)
+++ branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	Mon Sep 26 22:17:57 2005
@@ -2077,7 +2077,8 @@
 		    <entry>
 		      <link linkend='pkgCmdKeep'>Cancel</link> any
 		      pending installation, upgrade, or removal of the
-		      currently selected package.
+		      currently selected package, and remove any hold
+		      that was set on the package.
 		    </entry>
 		  </row>
 
@@ -3088,7 +3089,8 @@
 		  <para>
 		    Any action that was to be performed on the package
 		    -- installation, removal, or upgrade -- is
-		    cancelled.
+		    cancelled, and any persistent hold that was set on
+		    the package is removed.
 		  </para>
 		</entry>
 	      </row>
@@ -5491,7 +5493,8 @@
 		<entry><literal>:</literal></entry>
 		<entry>
 		  <link linkend='pkgCmdKeep'>Cancels</link> all
-		  installation or removal requests for a package.
+		  installation or removal requests and all holds for a
+		  package.
 		</entry>
 	      </row>
 

Modified: branches/aptitude-0.3/aptitude/src/pkg_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_item.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_item.cc	Mon Sep 26 22:17:57 2005
@@ -154,7 +154,7 @@
   // Keep, don't hold, the package.
   (*apt_cache_file)->mark_keep(package,
 			       false,
-			       (*apt_cache_file)->get_ext_state(package).selection_state==pkgCache::State::Hold,
+			       false,
 			       undo);
 }