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

[Daniel Burrows]

Author: dburrows
Date: Sat Apr 30 19:42:53 2005
New Revision: 3208

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
Log:
Support the new flags in mangled package names.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 30 19:42:53 2005
@@ -1,5 +1,10 @@
 2005-04-30  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_do_action.cc:
+
+	  Support the new action flags and stuff in the name-mangling
+	  code.
+
 	* src/cmdline/cmdline_action.cc, src/cmdline/cmdline_common.h, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_resolver.h:
 
 	  Add support for manipulating the automatic flag from the

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc	Sat Apr 30 19:42:53 2005
@@ -163,6 +163,21 @@
 	    action=cmdline_keep;
 	    argv[i][tmp]=0;
 	    break;
+	  case 'm':
+	  case 'M':
+	    if(tmp>0 && argv[i][tmp-1]=='&')
+	      {
+		argv[i][tmp-1]=0;
+		if(argv[i][tmp]=='m')
+		  action=cmdline_unmarkauto;
+		else
+		  action=cmdline_markauto;
+	      }
+	    else if(tmp>0 && argv[i][tmp-1]=='+' && argv[i][tmp]=='M')
+	      {
+		argv[i][tmp-1]=0;
+		action=cmdline_installauto;
+	      }
 	  }
 
       cmdline_applyaction(argv[i], action,