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

Daniel Burrows dburrows@costa.debian.org
Wed Jul 13 21:01:08 UTC 2005


Author: dburrows
Date: Wed Jul 13 21:00:55 2005
New Revision: 3648

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/manpage.xml
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.h
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.h
   branches/aptitude-0.3/aptitude/src/main.cc
Log:
Add basic support for scheduling commands without actually performing them.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Jul 13 21:00:55 2005
@@ -1,5 +1,11 @@
 2005-07-13  Daniel Burrows  <dburrows@debian.org>
 
+	* doc/en/manpage.xml, src/cmdline/cmdline_do_action.cc, src/cmdline/cmdline_do_action.h, src/cmdline/cmdline_upgrade.cc, src/cmdline/cmdline_upgrade.h, src/main.cc:
+
+	  Add basic support for writing commands to the selection database
+	  without actually executing them.  (NB: this may do bad things in
+	  corner cases, like selecting particular versions)
+
 	* doc/en/aptitude.xml, src/cmdline/cmdline_do_action.cc, src/main.cc:
 
 	  Add support for "keep" and "keep-all" commands; the former

Modified: branches/aptitude-0.3/aptitude/doc/en/manpage.xml
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/en/manpage.xml	(original)
+++ branches/aptitude-0.3/aptitude/doc/en/manpage.xml	Wed Jul 13 21:00:55 2005
@@ -751,6 +751,29 @@
       </varlistentry>
 
       <varlistentry>
+	<term><literal>--schedule-only</literal></term>
+
+	<listitem>
+	  <para>
+	    For commands that modify package states, schedule
+	    operations to be performed in the future, but don't
+	    perform them.  You can execute scheduled actions by
+	    running <literal>aptitude install</literal> with no
+	    arguments.  This is equivalent to making the corresponding
+	    selections in <link linkend='secUsingVisual'>visual
+	    mode</link>, then exiting the program normally.
+	  </para>
+
+	  <para>
+	    For instance, <literal>aptitude --schedule-only install
+	    evolution</literal> will schedule the
+	    <literal>evolution</literal> package for later
+	    installation.
+	  </para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term><literal>-t</literal> <replaceable>release</replaceable>, <literal>--target-release</literal> <replaceable>release</replaceable></term>
 
 	<listitem>

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	Wed Jul 13 21:00:55 2005
@@ -34,7 +34,8 @@
 		      const char *status_fname, bool simulate,
 		      bool assume_yes, bool download_only, bool fix_broken,
 		      bool showvers, bool showdeps, bool showsize,
-		      bool visual_preview, bool always_prompt, int verbose)
+		      bool visual_preview, bool always_prompt,
+		      bool queue_only, int verbose)
 {
   _error->DumpErrors();
 
@@ -215,6 +216,13 @@
 			    showvers, showdeps, showsize,
 			    always_prompt, verbose, assume_yes,
 			    !fix_broken);
+  else if(queue_only)
+    {
+      if(!(*apt_cache_file)->save_selection_list(progress))
+	return -1;
+      else
+	return 0;
+    }
   else
     {
       if(!cmdline_do_prompt(dist_upgrade,

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.h	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.h	Wed Jul 13 21:00:55 2005
@@ -9,6 +9,8 @@
 		      const char *status_fname, bool simulate,
 		      bool assume_yes, bool download_only, bool fix_broken,
 		      bool showvers, bool showdeps, bool showsize,
-		      bool visual_preview, bool always_prompt, int verbose);
+		      bool visual_preview, bool always_prompt,
+		      bool queue_only,
+		      int verbose);
 
 #endif // CMDLINE_DO_ACTION_H

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc	Wed Jul 13 21:00:55 2005
@@ -23,7 +23,8 @@
 		    bool assume_yes, bool download_only,
 		    bool showvers, bool showdeps, bool showsize,
 		    bool visual_preview,
-		    bool always_prompt, int verbose)
+		    bool always_prompt, bool queue_only,
+		    int verbose)
 {
   pkgset to_install, to_hold, to_remove, to_purge;
 
@@ -80,6 +81,13 @@
 			    showvers, showdeps, showsize,
 			    always_prompt, verbose, assume_yes,
 			    false);
+  else if(queue_only)
+    {
+      if(!(*apt_cache_file)->save_selection_list(progress))
+	return -1;
+      else
+	return 0;
+    }
   else
     {
 

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.h	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.h	Wed Jul 13 21:00:55 2005
@@ -9,7 +9,7 @@
 		    const char *status_fname, bool simulate,
 		    bool assume_yes, bool download_only,
 		    bool showvers, bool showdeps, bool showsize,
-		    bool visual_preview,
-		    bool always_prompt, int verbose);
+		    bool visual_preview, bool always_prompt,
+		    bool queue_only, int verbose);
 
 #endif // CMDLINE_UPGRADE_H

Modified: branches/aptitude-0.3/aptitude/src/main.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/main.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/main.cc	Wed Jul 13 21:00:55 2005
@@ -162,7 +162,7 @@
 }
 
 // This handles options with no single-character equivalent
-enum {OPTION_VERSION=1, OPTION_VISUAL_PREVIEW};
+enum {OPTION_VERSION=1, OPTION_VISUAL_PREVIEW, OPTION_QUEUE_ONLY};
 int getopt_result;
 
 option opts[]={
@@ -182,6 +182,7 @@
   {"sort", 1, NULL, 'O'},
   {"target-release", 1, NULL, 't'},
   {"visual-preview", 0, &getopt_result, OPTION_VISUAL_PREVIEW},
+  {"schedule-only", 0, &getopt_result, OPTION_QUEUE_ONLY},
   {0,0,0,0}
 };
 
@@ -210,7 +211,7 @@
   bool simulate=aptcfg->FindB(PACKAGE "::CmdLine::Simulate", false);
   bool download_only=aptcfg->FindB(PACKAGE "::CmdLine::Download-Only", false);;
 
-  bool update_only=false, install_only=false;
+  bool update_only=false, install_only=false, queue_only=false;
   bool assume_yes=aptcfg->FindB(PACKAGE "::CmdLine::Assume-Yes", false);
   bool fix_broken=aptcfg->FindB(PACKAGE "::CmdLine::Fix-Broken", false);
   bool showvers=aptcfg->FindB(PACKAGE "::CmdLine::Show-Versions", false);
@@ -318,6 +319,9 @@
 	    case OPTION_VISUAL_PREVIEW:
 	      visual_preview=true;	      
 	      break;
+	    case OPTION_QUEUE_ONLY:
+	      queue_only=true;
+	      break;
 	    default:
 	      fprintf(stderr, "%s",
 		      _("WEIRDNESS: unknown option code received\n"));
@@ -402,13 +406,15 @@
 				     status_fname,
 				     simulate, assume_yes, download_only,
 				     fix_broken, showvers, showdeps, showsize,
-				     visual_preview, always_prompt, verbose);
+				     visual_preview, always_prompt,
+				     queue_only, verbose);
 	  else if(!strcasecmp(argv[optind], "upgrade"))
 	    return cmdline_upgrade(argc-optind, argv+optind,
 				   status_fname,
 				   simulate, assume_yes, download_only,
 				   showvers, showdeps, showsize,
-				   visual_preview, always_prompt, verbose);
+				   visual_preview, always_prompt,
+				   queue_only, verbose);
 	  else if(!strcasecmp(argv[optind], "download"))
 	    return cmdline_download(argc-optind, argv+optind);
 	  else if(!strcasecmp(argv[optind], "changelog"))




More information about the Aptitude-svn-commit mailing list