Author: stsp Date: Fri Aug 10 10:47:04 2018 New Revision: 1837790 URL: http://svn.apache.org/viewvc?rev=1837790&view=rev Log: Make 'svnadmin verify --keep-going' always show an error summary.
Previously, the error summary was not displayed if the --quiet option was used in combination with --keep-going. The purpose of the --quiet option is to suppress verbose progress output. The purpose of the --keep-going option is to support long-running and non-interactive verification of one or more repositories. In which case instant progress output is of low importance but a summary of errors detected is invaluable so it makes little sense to suppress the summary. * subversion/svnadmin/svnadmin.c (subcommand_verify): Display the --keep-going error summary regardless of whetehr the --quiet option was passed. Modified: subversion/trunk/subversion/svnadmin/svnadmin.c Modified: subversion/trunk/subversion/svnadmin/svnadmin.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1837790&r1=1837789&r2=1837790&view=diff ============================================================================== --- subversion/trunk/subversion/svnadmin/svnadmin.c (original) +++ subversion/trunk/subversion/svnadmin/svnadmin.c Fri Aug 10 10:47:04 2018 @@ -2257,15 +2257,16 @@ subcommand_verify(apr_getopt_t *os, void check_cancel, NULL, pool)); /* Show the --keep-going error summary. */ - if (!opt_state->quiet - && opt_state->keep_going - && verify_baton.error_summary->nelts > 0) + if (opt_state->keep_going && verify_baton.error_summary->nelts > 0) { int rev_maxlength; svn_revnum_t end_revnum; apr_pool_t *iterpool; int i; + if (feedback_stream == NULL) /* happens when we are in --quiet mode */ + feedback_stream = recode_stream_create(stdout, pool); + svn_error_clear( svn_stream_puts(feedback_stream, _("\n-----Summary of corrupt revisions-----\n")));