diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2014-05-27 04:55:31 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2014-05-27 04:55:31 +0000 |
| commit | 41a48a0a1803245a188068c5200383b9543c25b2 (patch) | |
| tree | 6d1265a766b5c11e4c2414a994dbabb861526c73 /subversion/libsvn_wc/wc_db_wcroot.c | |
| parent | 219f5ebf8fca3572d8d4265d78d0e4670ca35a27 (diff) | |
Vendor import svn-1.8.9vendor/subversion/subversion-1.8.9
Notes
Notes:
svn path=/vendor/subversion/dist/; revision=266729
svn path=/vendor/subversion/subversion-1.8.9/; revision=266730; tag=vendor/subversion/subversion-1.8.9
Diffstat (limited to 'subversion/libsvn_wc/wc_db_wcroot.c')
| -rw-r--r-- | subversion/libsvn_wc/wc_db_wcroot.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/subversion/libsvn_wc/wc_db_wcroot.c b/subversion/libsvn_wc/wc_db_wcroot.c index 21173e50cfa2..d801451f613e 100644 --- a/subversion/libsvn_wc/wc_db_wcroot.c +++ b/subversion/libsvn_wc/wc_db_wcroot.c @@ -690,8 +690,12 @@ try_symlink_as_dir: svn_error_clear(err); *wcroot = NULL; } - else - SVN_ERR(err); + else if (err) + { + /* Close handle if we are not going to use it to support + upgrading with exclusive wc locking. */ + return svn_error_compose_create(err, svn_sqlite__close(sdb)); + } } else { |