mirror/syncthing
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2025-12-23 22:18:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow upgrade without config dir (fixes #10240) (#10241)

Browse Source
This commit is contained in:
Jakob Borg
2025-08-12 18:44:57 +02:00
committed by GitHub
parent 5d8033343f
commit fcf4916086
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/syncthing/main.go
View File

@@ -868,12 +868,16 @@ func (u upgradeCmd) Run() error {
lf := flock.New(locations.Get(locations.LockFile)) lf := flock.New(locations.Get(locations.LockFile))
var locked bool var locked bool
locked, err = lf.TryLock() locked, err = lf.TryLock()
if err != nil { // ErrNotExist is a valid error if this is a new/blank installation
// without a config dir, in which case we can proceed with a normal
// non-API upgrade.
switch {
case err != nil && !os.IsNotExist(err):
slog.Error("Failed to lock for upgrade", slogutil.Error(err)) slog.Error("Failed to lock for upgrade", slogutil.Error(err))
os.Exit(1) os.Exit(1)
} else if locked { case locked:
err = upgradeViaRest() err = upgradeViaRest()
} else { default:
err = upgrade.To(release) err = upgrade.To(release)
} }
} }