From 8cb44bb11d2a872ce5df08d442622babafd92ebb Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 20 Oct 2023 10:20:12 +0200 Subject: [PATCH] Fix settings import validation --- sync/settings.go | 2 +- sync/util.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sync/settings.go b/sync/settings.go index 586edad0..071c6c1e 100644 --- a/sync/settings.go +++ b/sync/settings.go @@ -263,7 +263,7 @@ func ImportSettings(r *SettingsImportRequest) (*ImportResult, error) { } if checked < len(settings) { result.ContainsUnknown = true - if !r.AllowUnknown { + if !r.AllowUnknown && !r.ValidateOnly { return nil, fmt.Errorf("%w: the export contains unknown settings", ErrInvalidImportRequest) } } diff --git a/sync/util.go b/sync/util.go index 5a0e5f3a..bd343096 100644 --- a/sync/util.go +++ b/sync/util.go @@ -140,7 +140,7 @@ func parseExport(request *ImportRequest, export any) error { default: // Checksums not supported. } - if err != nil && errors.Is(err, filesig.ErrChecksumMissing) { + if err != nil && !errors.Is(err, filesig.ErrChecksumMissing) { return fmt.Errorf("failed to verify checksum: %w", err) }