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

[Daniel Burrows]

Author: dburrows
Date: Mon Sep 26 21:10:20 2005
New Revision: 4296

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_action.cc
Log:
Unreverse logic in printing the message about not being able to forbid upgrades of nonupgradable packages.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Sep 26 21:10:20 2005
@@ -1,5 +1,11 @@
 2005-09-26  Daniel Burrows  <dburrows at debian.org>
 
+	* src/cmdline/cmdline_action.cc:
+
+	  Only print a message about not being able to forbid an upgrade
+	  because the package is not upgradable for packages that are
+	  *NOT* upgradable, not packages that are.  (Closes: #246140)
+
 	* src/cmdline/cmdline_show.cc:
 
 	  Abort with an error message if some of the packages the user

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_action.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_action.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_action.cc	Mon Sep 26 21:10:20 2005
@@ -129,7 +129,7 @@
 	{
 	  if(pkg.CurrentVer().end())
 	    printf(_("Package %s is not installed, cannot forbid an upgrade\n"), pkg.Name());
-	  else if((*apt_cache_file)[pkg].Upgradable())
+	  else if(!(*apt_cache_file)[pkg].Upgradable())
 	    printf(_("Package %s is not upgradable, cannot forbid an upgrade\n"), pkg.Name());
 	}
     default: