Author: brane
Date: Tue Jun 9 06:47:06 2015
New Revision: 1684325
URL: http://svn.apache.org/r1684325
Log:
Follow up to r1683311: Fix an unintended doubling of error messages
in 'svnadmin verify' without the --keep-going flag.
* subversion/libsvn_subr/dump.c
(svn_repos_verify_fs3): If keep_going is false, do not send notifications
about errors but just return the error instead.
Modified:
subversion/trunk/subversion/libsvn_repos/dump.c
Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1684325&r1=1684324&r2=1684325&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Tue Jun 9 06:47:06 2015
@@ -2430,9 +2430,6 @@ svn_repos_verify_fs3(svn_repos_t *repos,
}
else if (err)
{
- notify_verification_error(SVN_INVALID_REVNUM, err, notify_func,
- notify_baton, iterpool);
-
if (!keep_going)
{
/* Return the error, the caller doesn't want us to continue. */
@@ -2440,7 +2437,9 @@ svn_repos_verify_fs3(svn_repos_t *repos,
}
else
{
- /* Clear the error and keep going. */
+ /* Notify about the error, clear it and keep going. */
+ notify_verification_error(SVN_INVALID_REVNUM, err, notify_func,
+ notify_baton, iterpool);
failed_metadata = TRUE;
svn_error_clear(err);
}
@@ -2463,9 +2462,6 @@ svn_repos_verify_fs3(svn_repos_t *repos,
}
else if (err)
{
- notify_verification_error(rev, err, notify_func, notify_baton,
- iterpool);
-
if (!keep_going)
{
/* Return the error, the caller doesn't want us to continue. */
@@ -2473,7 +2469,9 @@ svn_repos_verify_fs3(svn_repos_t *repos,
}
else
{
- /* Clear the error and keep going. */
+ /* Notify about the error, clear it and keep going. */
+ notify_verification_error(rev, err, notify_func, notify_baton,
+ iterpool);
++failed_revisions;
svn_error_clear(err);
}
