diff options
| author | peter <peter@FreeBSD.org> | 2014-05-27 04:55:31 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2014-05-27 04:55:31 +0000 |
| commit | 9efa638bec6d135464ff9b3bab358c76671c87bf (patch) | |
| tree | 6d1265a766b5c11e4c2414a994dbabb861526c73 /subversion/libsvn_wc/wc_db_wcroot.c | |
| parent | b168ae828108b6f3a7d68ace24b6e8383a081fb5 (diff) | |
| download | FreeBSD-src-9efa638bec6d135464ff9b3bab358c76671c87bf.zip FreeBSD-src-9efa638bec6d135464ff9b3bab358c76671c87bf.tar.gz | |
Vendor import svn-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 21173e5..d801451 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 { |
