- Fixed bug #997, so that output is correctly conrolled by the 'affected'
  verbosity token.
This commit is contained in:
Paul Beckingham 2012-04-29 00:09:34 -04:00
parent 9bfda55000
commit 10aa70a53b
2 changed files with 9 additions and 8 deletions

View file

@ -28,6 +28,8 @@ Bugs
clearly stated (thanks to Louis-Claude Canon). clearly stated (thanks to Louis-Claude Canon).
+ Applied patch for bug #991, which removes an obsolete consistency check + Applied patch for bug #991, which removes an obsolete consistency check
(thanks to Louis-Claude Canon). (thanks to Louis-Claude Canon).
+ Fixed bug #997, so that output is correctly conrolled by the 'affected'
verbosity token.
+ Fixed grammar in feedback string (thanks to Uli Martens). + Fixed grammar in feedback string (thanks to Uli Martens).
+ Addressed valgrind complaints (thanks to Bryce Harrington). + Addressed valgrind complaints (thanks to Bryce Harrington).
+ Removed default configuration value for the obsolete 'annotations' setting. + Removed default configuration value for the obsolete 'annotations' setting.

View file

@ -162,21 +162,20 @@ int CmdCustom::execute (std::string& output)
<< optionalBlankLine (); << optionalBlankLine ();
if (context.verbose ("affected")) if (context.verbose ("affected"))
{
out << (filtered.size () == 1 out << (filtered.size () == 1
? STRING_CMD_CUSTOM_COUNT ? STRING_CMD_CUSTOM_COUNT
: format (STRING_CMD_CUSTOM_COUNTN, filtered.size ())); : format (STRING_CMD_CUSTOM_COUNTN, filtered.size ()));
// TODO Conditional if (maxrows && maxrows < (int)filtered.size ())
if (maxrows && maxrows < (int)filtered.size ()) out << ", " << format (STRING_CMD_CUSTOM_SHOWN, maxrows);
out << ", " << format (STRING_CMD_CUSTOM_SHOWN, maxrows);
// TODO Conditional if (maxlines && maxlines < (int)filtered.size ())
if (maxlines && maxlines < (int)filtered.size ()) out << ", "
out << ", " << format (STRING_CMD_CUSTOM_TRUNCATED, maxlines - table_header);
<< format (STRING_CMD_CUSTOM_TRUNCATED, maxlines - table_header);
if (context.verbose ("affected"))
out << "\n"; out << "\n";
}
} }
else else
{ {