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

[Daniel Burrows]

Author: dburrows
Date: Wed Sep 21 22:31:50 2005
New Revision: 4160

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/broken_indicator.cc
Log:
Don't create a broken_indicator fragment for every single package (accidentally put some code in the wrong place..)

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Sep 21 22:31:50 2005
@@ -2,6 +2,11 @@
 
 	* src/broken_indicator.cc:
 
+	  Fix the placement of a bunch of code in broken_indicator::update
+	  that accidentally ended up inside a loop.
+
+	* src/broken_indicator.cc:
+
 	  Dim out the unavailable actions in the broken hint line.
 
 	* src/vscreen/fragment.cc:

Modified: branches/aptitude-0.3/aptitude/src/broken_indicator.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/broken_indicator.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/broken_indicator.cc	Wed Sep 21 22:31:50 2005
@@ -311,70 +311,70 @@
 	    else if(cmp>0)
 	      ++downgrade_count;
 	  }
+      }
 
-	vector<fragment *> fragments;
-
-	string countstr
-	  = ssprintf(state.solutions_exhausted?"[%d/%d]":"[%d(%d)/...]",
-		     state.selected_solution + 1,
-		     state.generated_solutions);
-	fragments.push_back(fragf("%s ", countstr.c_str()));
+    vector<fragment *> fragments;
 
-	fragments.push_back(fragf(_("Suggest ")));
+    string countstr
+      = ssprintf(state.solutions_exhausted?"[%d/%d]":"[%d(%d)/...]",
+		 state.selected_solution + 1,
+		 state.generated_solutions);
+    fragments.push_back(fragf("%s ", countstr.c_str()));
 
-	vector<fragment *> suggestions;
+    fragments.push_back(fragf(_("Suggest ")));
 
-	if(install_count>1)
-	  suggestions.push_back(text_fragment(ssprintf(_("%d installs"),
-						       install_count)));
-	else if(install_count == 1)
-	  suggestions.push_back(text_fragment(_("1 install")));
+    vector<fragment *> suggestions;
 
-	if(remove_count>1)
-	  suggestions.push_back(text_fragment(ssprintf(_("%d removals"),
-						       remove_count)));
-	else if(remove_count == 1)
-	  suggestions.push_back(text_fragment(_("1 removal")));
+    if(install_count>1)
+      suggestions.push_back(text_fragment(ssprintf(_("%d installs"),
+						   install_count)));
+    else if(install_count == 1)
+      suggestions.push_back(text_fragment(_("1 install")));
 
-	if(keep_count>1)
-	  suggestions.push_back(text_fragment(ssprintf(_("%d keeps"),
-						       keep_count)));
-	else if(keep_count == 1)
-	  suggestions.push_back(text_fragment(_("1 keep")));
+    if(remove_count>1)
+      suggestions.push_back(text_fragment(ssprintf(_("%d removals"),
+						   remove_count)));
+    else if(remove_count == 1)
+      suggestions.push_back(text_fragment(_("1 removal")));
 
-	if(upgrade_count>1)
-	  suggestions.push_back(text_fragment(ssprintf(_("%d upgrades"), upgrade_count)));
-	else if(upgrade_count == 1)
-	  suggestions.push_back(text_fragment(_("1 upgrade")));
+    if(keep_count>1)
+      suggestions.push_back(text_fragment(ssprintf(_("%d keeps"),
+						   keep_count)));
+    else if(keep_count == 1)
+      suggestions.push_back(text_fragment(_("1 keep")));
 
-	if(downgrade_count>1)
-	  suggestions.push_back(text_fragment(ssprintf(_("%d downgrades"), downgrade_count)));
-	else if(downgrade_count == 1)
-	  suggestions.push_back(text_fragment(_("1 downgrade")));
+    if(upgrade_count>1)
+      suggestions.push_back(text_fragment(ssprintf(_("%d upgrades"), upgrade_count)));
+    else if(upgrade_count == 1)
+      suggestions.push_back(text_fragment(_("1 upgrade")));
 
-	fragments.push_back(join_fragments(suggestions,
-					   L","));
+    if(downgrade_count>1)
+      suggestions.push_back(text_fragment(ssprintf(_("%d downgrades"), downgrade_count)));
+    else if(downgrade_count == 1)
+      suggestions.push_back(text_fragment(_("1 downgrade")));
 
-	if(state.background_thread_active)
-	  {
-	    vector<fragment_column_entry> columns;
-	    columns.push_back(fragment_column_entry(true, 1, fragment_column_entry::top, hardwrapbox(sequence_fragment(fragments))));
+    fragments.push_back(join_fragments(suggestions,
+				       L","));
 
-	    columns.push_back(fragment_column_entry(false, 1, fragment_column_entry::top, NULL));
+    if(state.background_thread_active)
+      {
+	vector<fragment_column_entry> columns;
+	columns.push_back(fragment_column_entry(true, 1, fragment_column_entry::top, hardwrapbox(sequence_fragment(fragments))));
 
-	    columns.push_back(fragment_column_entry(false, 1, fragment_column_entry::top, text_fragment(spin_string(state))));
+	columns.push_back(fragment_column_entry(false, 1, fragment_column_entry::top, NULL));
 
+	columns.push_back(fragment_column_entry(false, 1, fragment_column_entry::top, text_fragment(spin_string(state))));
 
-	    fragments.clear();
-	    fragments.push_back(fragment_columns(columns));
-	  }
-	else
-	  fragments.push_back(newline_fragment());
-	fragments.push_back(hardwrapbox(key_hint_fragment(state)));
 
-	fragment *f=sequence_fragment(fragments);
-	set_fragment(f);
+	fragments.clear();
+	fragments.push_back(fragment_columns(columns));
       }
+    else
+      fragments.push_back(newline_fragment());
+    fragments.push_back(hardwrapbox(key_hint_fragment(state)));
+
+    fragment *f=sequence_fragment(fragments);
+    set_fragment(f);
 
     show();
   }