← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/bindings/swig/svn_client.i

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2014-05-20 22:45:32 UTC
  • mfrom: (0.2.12)
  • Revision ID: package-import@ubuntu.com-20140520224532-4fec3gohdzyy692g
Tags: 1.8.9-1
* New upstream release
* Merge changes from Ubuntu:
  - Add DEB-8 test for Apache functionality
  - debian/rules: Create pot file on build.
  - debian/rules: Ensure the doxygen output directory exists
  - Move svn2cl to subversion-tools' Suggests on Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/bindings/swig/svn_client.i
395
395
  svn_client_ctx_t(apr_pool_t *pool) {
396
396
    svn_error_t *err;
397
397
    svn_client_ctx_t *self;
398
 
    err = svn_client_create_context(&self, pool);
 
398
    apr_hash_t *cfg_hash;
 
399
 
 
400
    err = svn_config_get_config(&cfg_hash, NULL, pool);
 
401
    if (err)
 
402
      svn_swig_rb_handle_svn_error(err);
 
403
 
 
404
    err = svn_client_create_context2(&self, cfg_hash, pool);
399
405
    if (err)
400
406
      svn_swig_rb_handle_svn_error(err);
401
407
    return self;
512
518
                      apr_hash_t *config,
513
519
                      apr_pool_t *pool)
514
520
{
515
 
  ctx->config = config;
 
521
  svn_error_t *err;
 
522
 
 
523
  apr_hash_clear(ctx->config);
 
524
  err = svn_config_copy_config(&ctx->config, config,
 
525
                               apr_hash_pool_get(ctx->config));
 
526
  if (err)
 
527
    svn_swig_rb_handle_svn_error(err);
516
528
  return Qnil;
517
529
}
518
530