svn commit: r922816 - /subversion/trunk/subversion/libsvn_ra_svn/client.c

[st...@apache.org]

Author: stsp
Date: Sun Mar 14 11:40:05 2010
New Revision: 922816

URL: http://svn.apache.org/viewvc?rev=922816&view=rev
Log:
Revert r922533. As discussed with Bert, suggesting the default
config file location can be more misleading then helpful, depending
on the client setup. So we'll just assume that people know what
we mean when we talk about the "Subversion configuration file".

Modified:
    subversion/trunk/subversion/libsvn_ra_svn/client.c

Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=922816&r1=922815&r2=922816&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Sun Mar 14 11:40:05 2010
@@ -519,28 +519,12 @@ static svn_error_t *make_tunnel(const ch
   *conn = svn_ra_svn_create_conn(NULL, proc->out, proc->in, pool);
   err = svn_ra_svn_skip_leading_garbage(*conn, pool);
   if (err)
-    {
-      svn_error_t *err2;
-      const char *config_path;
+    return svn_error_quick_wrap(
+             err,
+             _("To better debug SSH connection problems, remove the -q "
+               "option from 'ssh' in the [tunnels] section of your "
+               "Subversion configuration file."));
 
-      err2 = svn_config_get_user_config_path(&config_path, NULL,
-                                             SVN_CONFIG_CATEGORY_CONFIG, pool);
-      if (err2)
-        return svn_error_compose_create(err, err2);
-      else
-        {
-          const char *msg;
-          msg = apr_psprintf(
-                  pool,
-                  _("Subversion runs SSH with the -q option by default. "
-                    "This may suppress some SSH error messages. "
-                    "To better debug SSH connection problems, set "
-                    "'ssh = $SVN_SSH ssh' (without a -q option) "
-                    "in the [tunnels] section of %s"),
-                  config_path);
-          return svn_error_quick_wrap(err, msg);
-        }
-    }
   return SVN_NO_ERROR;
 }