diff options
| -rw-r--r-- | models/admin.go | 2 | ||||
| -rw-r--r-- | models/repo.go | 14 | ||||
| -rw-r--r-- | templates/mail/auth/activate.tmpl | 2 | ||||
| -rw-r--r-- | templates/mail/auth/activate_email.tmpl | 2 | ||||
| -rw-r--r-- | templates/mail/auth/register_notify.tmpl | 2 | ||||
| -rw-r--r-- | templates/mail/auth/reset_passwd.tmpl | 2 |
6 files changed, 10 insertions, 14 deletions
diff --git a/models/admin.go b/models/admin.go index 4e4aba72..045728e4 100644 --- a/models/admin.go +++ b/models/admin.go @@ -74,7 +74,7 @@ func CreateRepositoryNotice(desc string) error { // creates a system notice when error occurs. func RemoveAllWithNotice(title, path string) { var err error - // workaround for Go not being able to remove read-only files/folders: https://github.com/golang/go/issues/9606 + // LEGACY [Go 1.7]: workaround for Go not being able to remove read-only files/folders: https://github.com/golang/go/issues/9606 // this bug should be fixed on Go 1.7, so the workaround should be removed when Gogs don't support Go 1.6 anymore: // https://github.com/golang/go/commit/2ffb3e5d905b5622204d199128dec06cefd57790 // Note: Windows complains when delete target does not exist, therefore we can skip deletion in such cases. diff --git a/models/repo.go b/models/repo.go index 62a99816..c12b1056 100644 --- a/models/repo.go +++ b/models/repo.go @@ -643,7 +643,7 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) { migrateTimeout := time.Duration(setting.Git.Timeout.Migrate) * time.Second - os.RemoveAll(repoPath) + RemoveAllWithNotice("Repository path erase before creation", repoPath) if err = git.Clone(opts.RemoteAddr, repoPath, git.CloneRepoOptions{ Mirror: true, Quiet: true, @@ -654,14 +654,14 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) { wikiRemotePath := wikiRemoteURL(opts.RemoteAddr) if len(wikiRemotePath) > 0 { - os.RemoveAll(wikiPath) + RemoveAllWithNotice("Repository wiki path erase before creation", repoPath) if err = git.Clone(wikiRemotePath, wikiPath, git.CloneRepoOptions{ Mirror: true, Quiet: true, Timeout: migrateTimeout, }); err != nil { log.Trace("Fail to clone wiki: %v", err) - os.RemoveAll(wikiPath) + RemoveAllWithNotice("Delete repository wiki for initialization failure", repoPath) } } @@ -890,7 +890,7 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, opts C // Initialize repository according to user's choice. if opts.AutoInit { os.MkdirAll(tmpDir, os.ModePerm) - defer os.RemoveAll(tmpDir) + defer RemoveAllWithNotice("Delete repository for auto-initialization", tmpDir) if err = prepareRepoCommit(repo, tmpDir, repoPath, opts); err != nil { return fmt.Errorf("prepareRepoCommit: %v", err) @@ -1009,11 +1009,7 @@ func CreateRepository(u *User, opts CreateRepoOptions) (_ *Repository, err error if !opts.IsMirror { repoPath := RepoPath(u.Name, repo.Name) if err = initRepository(sess, repoPath, u, repo, opts); err != nil { - if err2 := os.RemoveAll(repoPath); err2 != nil { - log.Error(4, "initRepository: %v", err) - return nil, fmt.Errorf( - "delete repo directory %s/%s failed(2): %v", u.Name, repo.Name, err2) - } + RemoveAllWithNotice("Delete repository for initialization failure", repoPath) return nil, fmt.Errorf("initRepository: %v", err) } diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl index f03c1656..16214767 100644 --- a/templates/mail/auth/activate.tmpl +++ b/templates/mail/auth/activate.tmpl @@ -10,6 +10,6 @@ <p>Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>:</p> <p><a href="{{AppUrl}}user/activate?code={{.Code}}">{{AppUrl}}user/activate?code={{.Code}}</a></p> <p>Not working? Try copying and pasting it to your browser.</p> - <p>© 2016 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p> + <p>© 2017 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p> </body> </html> diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl index 65cb5045..8b11b4f1 100644 --- a/templates/mail/auth/activate_email.tmpl +++ b/templates/mail/auth/activate_email.tmpl @@ -10,6 +10,6 @@ <p>Please click the following link to verify your email address within <b>{{.ActiveCodeLives}} hours</b>:</p> <p><a href="{{AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}">{{AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}</a></p> <p>Not working? Try copying and pasting it to your browser.</p> - <p>© 2016 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p> + <p>© 2017 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p> </body> </html> diff --git a/templates/mail/auth/register_notify.tmpl b/templates/mail/auth/register_notify.tmpl index 75a43564..3a937f64 100644 --- a/templates/mail/auth/register_notify.tmpl +++ b/templates/mail/auth/register_notify.tmpl @@ -9,6 +9,6 @@ <p>Hi <b>{{.Username}}</b>, this is your registration confirmation email for {{AppName}}!</p> <p>You can now login via username: {{.Username}}.</p> <p><a href="{{AppUrl}}user/login">{{AppUrl}}user/login</a></p> - <p>© 2016 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p> + <p>© 2017 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p> </body> </html> diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index aae05580..5176a712 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -10,6 +10,6 @@ <p>Please click the following link to verify your email address within <b>{{.ResetPwdCodeLives}} hours</b>:</p> <p><a href="{{AppUrl}}user/reset_password?code={{.Code}}">{{AppUrl}}user/reset_password?code={{.Code}}</a></p> <p>Not working? Try copying and pasting it to your browser.</p> - <p>© 2016 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p> + <p>© 2017 <a target="_blank" href="{{AppUrl}}">{{AppName}}</a></p> </body> </html> |