diff options
| author | James Moger <james.moger@gitblit.com> | 2012-08-17 15:15:56 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-08-17 15:15:56 -0400 |
| commit | eb741abbb84437a08004bac2e219513400d9e56c (patch) | |
| tree | 636c8e747bbc9681bef83d5be41eab5d251b98a2 | |
| parent | 83a77163e626f1df477acf9505cf196300b703fc (diff) | |
| download | gitblit-eb741abbb84437a08004bac2e219513400d9e56c.tar.gz gitblit-eb741abbb84437a08004bac2e219513400d9e56c.zip | |
LuceneExecutor could not delete the Lucene index from a working copy
| -rw-r--r-- | docs/04_releases.mkd | 1 | ||||
| -rw-r--r-- | src/com/gitblit/LuceneExecutor.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index ab81cb3e..624cb53f 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -11,6 +11,7 @@ If you are updating from an earlier release AND you have indexed branches with t #### fixes
+- Gitblit could not delete a Lucene index in a working copy on index upgrade
- Do not index submodule links (issue 119)
- Restore original user or team object on failure to update (issue 118)
- Fixes to relative path determination in repository search algorithm for symlinks (issue 116)
diff --git a/src/com/gitblit/LuceneExecutor.java b/src/com/gitblit/LuceneExecutor.java index 9cae3d52..42155f42 100644 --- a/src/com/gitblit/LuceneExecutor.java +++ b/src/com/gitblit/LuceneExecutor.java @@ -286,7 +286,7 @@ public class LuceneExecutor implements Runnable { close(repositoryName);
// delete the index folder
- File repositoryFolder = new File(repositoriesFolder, repositoryName);
+ File repositoryFolder = FileKey.resolve(new File(repositoriesFolder, repositoryName), FS.DETECTED);
File luceneIndex = new File(repositoryFolder, LUCENE_DIR);
if (luceneIndex.exists()) {
org.eclipse.jgit.util.FileUtils.delete(luceneIndex,
|