forked from gitea/gitea
Allow migrating installations with no local avatars (#1056)
This commit is contained in:
parent
80f900ebae
commit
bf24099114
|
@ -89,7 +89,7 @@ var migrations = []Migration{
|
||||||
// v19 -> v20
|
// v19 -> v20
|
||||||
NewMigration("generate and migrate Git hooks", generateAndMigrateGitHooks),
|
NewMigration("generate and migrate Git hooks", generateAndMigrateGitHooks),
|
||||||
// v20 -> v21
|
// v20 -> v21
|
||||||
NewMigration("use new avtar path name for security reason", useNewNameAvatars),
|
NewMigration("use new avatar path name for security reason", useNewNameAvatars),
|
||||||
}
|
}
|
||||||
|
|
||||||
// Migrate database to current version
|
// Migrate database to current version
|
||||||
|
|
|
@ -21,6 +21,10 @@ import (
|
||||||
func useNewNameAvatars(x *xorm.Engine) error {
|
func useNewNameAvatars(x *xorm.Engine) error {
|
||||||
d, err := os.Open(setting.AvatarUploadPath)
|
d, err := os.Open(setting.AvatarUploadPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
// Nothing to do if AvatarUploadPath does not exist
|
||||||
|
return nil
|
||||||
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
names, err := d.Readdirnames(0)
|
names, err := d.Readdirnames(0)
|
||||||
|
|
Loading…
Reference in New Issue