You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/06/06 17:25:58 UTC
svn commit: r1490325 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_subr/io.c
Author: breser
Date: Thu Jun 6 15:25:58 2013
New Revision: 1490325
URL: http://svn.apache.org/r1490325
Log:
Merge the r1488294 group from trunk:
* r1488294, r1489935
Add signal information to external program errors.
Justification:
Makes it easier to diagnose failures.
Votes:
+1: philip, danielsh (without r1489935)
+1: rhuijben, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_subr/io.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1488294,1489935
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1490325&r1=1490324&r2=1490325&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Jun 6 15:25:58 2013
@@ -66,14 +66,6 @@ Approved changes:
# blocking issues. If in doubt see this link for details:
# http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
- * r1488294, r1489935
- Add signal information to external program errors.
- Justification:
- Makes it easier to diagnose failures.
- Votes:
- +1: philip, danielsh (without r1489935)
- +1: rhuijben, stefan2
-
* r1490045
Use a unique media-type for svnpubsub.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/io.c?rev=1490325&r1=1490324&r2=1490325&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/io.c Thu Jun 6 15:25:58 2013
@@ -2795,10 +2795,23 @@ svn_io_wait_for_cmd(apr_proc_t *cmd_proc
if (exitwhy)
*exitwhy = exitwhy_val;
+ else if (APR_PROC_CHECK_SIGNALED(exitwhy_val)
+ && APR_PROC_CHECK_CORE_DUMP(exitwhy_val))
+ return svn_error_createf
+ (SVN_ERR_EXTERNAL_PROGRAM, NULL,
+ _("Process '%s' failed (signal %d, core dumped)"),
+ cmd, exitcode_val);
+ else if (APR_PROC_CHECK_SIGNALED(exitwhy_val))
+ return svn_error_createf
+ (SVN_ERR_EXTERNAL_PROGRAM, NULL,
+ _("Process '%s' failed (signal %d)"),
+ cmd, exitcode_val);
else if (! APR_PROC_CHECK_EXIT(exitwhy_val))
+ /* Don't really know what happened here. */
return svn_error_createf
(SVN_ERR_EXTERNAL_PROGRAM, NULL,
- _("Process '%s' failed (exitwhy %d)"), cmd, exitwhy_val);
+ _("Process '%s' failed (exitwhy %d, exitcode %d)"),
+ cmd, exitwhy_val, exitcode_val);
if (exitcode)
*exitcode = exitcode_val;