From b97ffc16eac8d81deb8c2eaf033d5547c8dbdb51 Mon Sep 17 00:00:00 2001 From: James Houlahan Date: Mon, 21 Nov 2022 18:01:29 +0100 Subject: [PATCH] Other: Don't migrate if prefs doesn't exist --- internal/app/migration.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/app/migration.go b/internal/app/migration.go index 196e2ad1..0d8415fa 100644 --- a/internal/app/migration.go +++ b/internal/app/migration.go @@ -20,6 +20,7 @@ package app import ( "encoding/json" "fmt" + "io/fs" "os" "path/filepath" "strconv" @@ -48,7 +49,9 @@ func migrateKeychainHelper(locations *locations.Locations) error { } b, err := os.ReadFile(filepath.Join(configDir, "protonmail", "bridge", "prefs.json")) - if err != nil { + if errors.Is(err, fs.ErrNotExist) { + return nil + } else if err != nil { return fmt.Errorf("failed to read old prefs file: %w", err) } @@ -78,7 +81,9 @@ func migrateOldSettings(v *vault.Vault) error { } b, err := os.ReadFile(filepath.Join(configDir, "protonmail", "bridge", "prefs.json")) - if err != nil { + if errors.Is(err, fs.ErrNotExist) { + return nil + } else if err != nil { return fmt.Errorf("failed to read old prefs file: %w", err) }