summaryrefslogtreecommitdiffstats
path: root/models/wiki.go
diff options
context:
space:
mode:
Diffstat (limited to 'models/wiki.go')
-rw-r--r--models/wiki.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/models/wiki.go b/models/wiki.go
index bcf97c0765..9ae3386333 100644
--- a/models/wiki.go
+++ b/models/wiki.go
@@ -115,7 +115,11 @@ func (repo *Repository) updateWikiPage(doer *User, oldWikiName, newWikiName, con
if err != nil {
return err
}
- defer RemoveTemporaryPath(basePath)
+ defer func() {
+ if err := RemoveTemporaryPath(basePath); err != nil {
+ log.Error("Merge: RemoveTemporaryPath: %s", err)
+ }
+ }()
cloneOpts := git.CloneRepoOptions{
Bare: true,
@@ -246,7 +250,11 @@ func (repo *Repository) DeleteWikiPage(doer *User, wikiName string) (err error)
if err != nil {
return err
}
- defer RemoveTemporaryPath(basePath)
+ defer func() {
+ if err := RemoveTemporaryPath(basePath); err != nil {
+ log.Error("Merge: RemoveTemporaryPath: %s", err)
+ }
+ }()
if err := git.Clone(repo.WikiPath(), basePath, git.CloneRepoOptions{
Bare: true,