subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1735680 - /subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c
Date Fri, 18 Mar 2016 21:10:35 GMT
Author: danielsh
Date: Fri Mar 18 21:10:34 2016
New Revision: 1735680

URL: http://svn.apache.org/viewvc?rev=1735680&view=rev
Log:
Make SIGINT abort a commit, even at the interactive plaintext prompt.
(Issue #4624.)

Follow-up to r30730 (r870804).

Found by: Richlv 

* subversion/libsvn_subr/prompt.c
  (plaintext_prompt_helper): Propagate canncellations.

Modified:
    subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c

Modified: subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c?rev=1735680&r1=1735679&r2=1735680&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c Fri Mar 18 21:10:34 2016
@@ -831,9 +831,8 @@ plaintext_prompt_helper(svn_boolean_t *m
         {
           if (err->apr_err == SVN_ERR_CANCELLED)
             {
-              svn_error_clear(err);
               *may_save_plaintext = FALSE;
-              return SVN_NO_ERROR;
+              return err;
             }
           else
             return err;



Mime
View raw message