summaryrefslogtreecommitdiff
diff options
authorPaweł Stołowski <stolowski@gmail.com>2022-06-23 15:47:12 +0200
committerPaweł Stołowski <stolowski@gmail.com>2022-06-23 15:47:12 +0200
commit85ae240486ee69eb0a69b1f994885546cf74cd9e (patch)
tree9794a966794eeaea953893d57ac26a0dfd278cbb
parent9199c3ae0f54d105fda363433f347dcd47f37db0 (diff)
Fix comment placement
-rw-r--r--overlord/assertstate/assertstate.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/overlord/assertstate/assertstate.go b/overlord/assertstate/assertstate.go
index 656303acc0..52acc79f99 100644
--- a/overlord/assertstate/assertstate.go
+++ b/overlord/assertstate/assertstate.go
@@ -856,14 +856,14 @@ func TryEnforceValidationSets(st *state.State, validationSets []string, userID i
valsets, err := EnforcedValidationSets(st, extraVs...)
if err != nil {
- // the returned error may be ValidationSetsValidationError which is normal and means we cannot enforce
- // the new validation sets - the caller should resolve the error and retry.
return err
}
if err := valsets.Conflict(); err != nil {
return err
}
if err := valsets.CheckInstalledSnaps(snaps, ignoreValidation); err != nil {
+ // the returned error may be ValidationSetsValidationError which is normal and means we cannot enforce
+ // the new validation sets - the caller should resolve the error and retry.
return err
}