You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/03/06 12:43:45 UTC
svn commit: r1664593 - /subversion/trunk/subversion/libsvn_subr/config_win.c
Author: rhuijben
Date: Fri Mar 6 11:43:44 2015
New Revision: 1664593
URL: http://svn.apache.org/r1664593
Log:
* subversion/libsvn_subr/config_win.c
(svn_config__parse_registry): Don't hide the actual error when opening the
registry fails.
Modified:
subversion/trunk/subversion/libsvn_subr/config_win.c
Modified: subversion/trunk/subversion/libsvn_subr/config_win.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config_win.c?rev=1664593&r1=1664592&r2=1664593&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config_win.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config_win.c Fri Mar 6 11:43:44 2015
@@ -197,15 +197,13 @@ svn_config__parse_registry(svn_config_t
&hkey);
if (err != ERROR_SUCCESS)
{
- const int is_enoent = APR_STATUS_IS_ENOENT(APR_FROM_OS_ERROR(err));
- if (!is_enoent)
- return svn_error_createf(SVN_ERR_BAD_FILENAME, NULL,
+ apr_status_t apr_err = APR_FROM_OS_ERROR(err);
+
+ if (must_exist || APR_STATUS_IS_ENOENT(apr_err))
+ return svn_error_createf(SVN_ERR_BAD_FILENAME,
+ svn_error_wrap_apr(apr_err, NULL),
_("Can't open registry key '%s'"),
svn_dirent_local_style(file, pool));
- else if (must_exist && is_enoent)
- return svn_error_createf(SVN_ERR_BAD_FILENAME, NULL,
- _("Can't find registry key '%s'"),
- svn_dirent_local_style(file, pool));
else
return SVN_NO_ERROR;
}