thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

[BRANDING] Use forgejo binary name

Browse source 
- Use `forgejo` binary name for migration suggestions.
- Resolves https://codeberg.org/forgejo/forgejo/issues/869#issuecomment-944501

(cherry picked from commit 418a0bed8f)
(cherry picked from commit 734579ce9b)
(cherry picked from commit 8b7cf605f2)
(cherry picked from commit c59e1a4e61)
This commit is contained in:
Gusted 2023-06-18 20:34:26 +02:00 committed by Earl Warren
parent ee2cfd1cd0
commit e3877892e1
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/migrations/migrations.go
View file

@ -540,7 +540,7 @@ func EnsureUpToDate(x *xorm.Engine) error {
expected := ExpectedVersion() expected := ExpectedVersion()
if currentDB != expected { if currentDB != expected {
return fmt.Errorf(`Current database version %d is not equal to the expected version %d. Please run "gitea [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expected) return fmt.Errorf(`Current database version %d is not equal to the expected version %d. Please run "forgejo [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expected)
} }
return nil return nil

2
routers/common/db.go
View file

@ -51,7 +51,7 @@ func migrateWithSetting(x *xorm.Engine) error {
return migrations.Migrate(x) return migrations.Migrate(x)
} else if expected := migrations.ExpectedVersion(); current != expected { } else if expected := migrations.ExpectedVersion(); current != expected {
log.Fatal(`"database.AUTO_MIGRATION" is disabled, but current database version %d is not equal to the expected version %d.`+ log.Fatal(`"database.AUTO_MIGRATION" is disabled, but current database version %d is not equal to the expected version %d.`+
`You can set "database.AUTO_MIGRATION" to true or migrate manually by running "gitea [--config /path/to/app.ini] migrate"`, current, expected) `You can set "database.AUTO_MIGRATION" to true or migrate manually by running "forgejo [--config /path/to/app.ini] migrate"`, current, expected)
} }
return nil return nil
} }