Skip to content

Commit e263209

Browse files
committed
fix migration issue from v0.3.5
1 parent 17220e3 commit e263209

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

Diff for: cmd/migration-tool/migration_035_and_older.go

+3-9
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,15 @@ func (u *migrationTool) IsMigrationNeeded() (bool, error) {
3535
majorVersion, minorVersion, patchVersion, err := version.DetectLegacyVersion()
3636
if err != nil {
3737
if err == version.ErrLegacyVersionNotFound {
38+
_logger.Info("Legacy version not found, migration is not needed.")
3839
return false, nil
3940
}
4041

4142
return false, err
4243
}
4344

44-
if majorVersion > 0 {
45-
return false, nil
46-
}
47-
48-
if minorVersion > 3 {
49-
return false, nil
50-
}
51-
52-
if minorVersion == 3 && patchVersion > 5 {
45+
if majorVersion > 0 || minorVersion > 3 || (minorVersion == 3 && patchVersion > 5) {
46+
_logger.Info("Legacy version is v%d.%d.%d, migration is not needed.", majorVersion, minorVersion, patchVersion)
5347
return false, nil
5448
}
5549

Diff for: go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/IceWhaleTech/CasaOS-Gateway
33
go 1.19
44

55
require (
6-
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220901034123-ca130f6b5ce9
6+
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220909125858-92fc5b2e0ae5
77
github.com/gin-contrib/gzip v0.0.6
88
github.com/gin-gonic/gin v1.8.1
99
github.com/spf13/viper v1.12.0

Diff for: go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
3939
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4040
github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
4141
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
42-
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220901034123-ca130f6b5ce9 h1:q4I/lSsCooxdd6LxinGy90y0n6V8EcaPBV1JCfpEnV4=
43-
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220901034123-ca130f6b5ce9/go.mod h1:2MiivEMzvh41codhEKUcn46WK3Ffesop/04qa9jsvQk=
42+
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220909125858-92fc5b2e0ae5 h1:vgAf0jVKCBo3wyjOZ4z9tB77lVrgIfz2CcQX2+4JTSI=
43+
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220909125858-92fc5b2e0ae5/go.mod h1:2MiivEMzvh41codhEKUcn46WK3Ffesop/04qa9jsvQk=
4444
github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc=
4545
github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
4646
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=

0 commit comments

Comments
 (0)