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

[Daniel Burrows]

Author: dburrows
Date: Mon Sep 26 04:05:05 2005
New Revision: 4267

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_spinner.cc
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_spinner.h
Log:
Disable output from the command-line spinner if the program is quiet.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Sep 26 04:05:05 2005
@@ -1,5 +1,10 @@
 2005-09-25  Daniel Burrows  <dburrows at debian.org>
 
+	* src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_spinner.cc, src/cmdline/cmdline_spinner.h:
+
+	  Disable output from the spinner when the quiet level is greater
+	  than zero.
+
 	* doc/en/aptitude.xml, doc/en/manpage.xml, src/main.cc:
 
 	  Add basic support for a 'quiet' option; it needs to be

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	Mon Sep 26 04:05:05 2005
@@ -410,7 +410,7 @@
     return resman->get_solution(resman->get_selected_solution(), 0);
 
 
-  cmdline_spinner spin;
+  cmdline_spinner spin(aptcfg->FindI("Quiet", 0));
 
   std::cout << "Resolving dependencies..." << std::endl;
 

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_spinner.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_spinner.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_spinner.cc	Mon Sep 26 04:05:05 2005
@@ -23,8 +23,8 @@
 
 #include <iostream>
 
-cmdline_spinner::cmdline_spinner()
-  : count(0)
+cmdline_spinner::cmdline_spinner(int _quiet_level)
+  : count(0), quiet_level(_quiet_level)
 {
 }
 
@@ -47,6 +47,9 @@
 
 void cmdline_spinner::display() const
 {
+  if(quiet_level > 0)
+    return;
+
   update_screen_width();
 
   // Build the string to output.

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_spinner.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_spinner.h	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_spinner.h	Mon Sep 26 04:05:05 2005
@@ -31,8 +31,11 @@
 
   /** The number of spins. */
   int count;
+
+  /** The quietness of this spinner. */
+  int quiet_level;
 public:
-  cmdline_spinner();
+  cmdline_spinner(int _quiet_level);
 
   /** Display the current spinner state, overwriting the current
    *  terminal line.