From 7786cb76f3bfc87f92aaae5cc70cbfa974b76868 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Tue, 15 Dec 2015 21:32:17 -0500 Subject: fix #2205 --- models/repo.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'models') diff --git a/models/repo.go b/models/repo.go index 82e34633..976dcabf 100644 --- a/models/repo.go +++ b/models/repo.go @@ -129,6 +129,8 @@ func NewRepoContext() { log.Fatal(4, "Fail to execute 'git config --global core.quotepath false': %s", stderr) } + // Clean up temporary data. + os.RemoveAll(filepath.Join(setting.AppDataPath, "tmp")) } // Repository represents a git repository. @@ -1301,12 +1303,14 @@ func DeleteRepository(uid, repoID int64) error { } } - wikiPath := repo.WikiPath() - if err = os.RemoveAll(wikiPath); err != nil { - desc := fmt.Sprintf("delete repository wiki [%s]: %v", wikiPath, err) - log.Warn(desc) - if err = CreateRepositoryNotice(desc); err != nil { - log.Error(4, "CreateRepositoryNotice: %v", err) + wikiPaths := []string{repo.WikiPath(), repo.LocalWikiPath()} + for _, wikiPath := range wikiPaths { + if err = os.RemoveAll(wikiPath); err != nil { + desc := fmt.Sprintf("delete repository wiki [%s]: %v", wikiPath, err) + log.Warn(desc) + if err = CreateRepositoryNotice(desc); err != nil { + log.Error(4, "CreateRepositoryNotice: %v", err) + } } } -- cgit v1.2.3