Skip to content

stbridge: Fix missing directory when importing before first start #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenxiaolong merged 1 commit into from
Jun 2, 2026
Merged

stbridge: Fix missing directory when importing before first start #144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions stbridge/stbridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,10 +956,15 @@ func ImportConfiguration(fd int, name string, password string) error {

configDir := locations.GetBaseDir(locations.ConfigBaseDir)

// configDir might not exist if the user tried to import before Syncthing
// started for the first time.
if err = os.MkdirAll(configDir, 0o700); err != nil {
return fmt.Errorf("failed to create: %q: %w", configDir, err)
}

// Try to atomically swap the active config dir with the temp dir. The temp
// dir cleanup above will delete the old files.
err = tryAtomicSwap(tempDir, configDir)
if err != nil {
if err = tryAtomicSwap(tempDir, configDir); err != nil {
return fmt.Errorf("failed to swap: %q <-> %q: %w", tempDir, configDir, err)
}

Expand Down