Merge pull request containers#1965 from mtrmac/verify-error

Fix error handling of signature.NewEphemeralGPGSigningMechanism
lukewarmtemp · Apr 6, 2023 · cd1c43c · cd1c43c
2 parents 0f3e6e3 + 4be583c
commit cd1c43c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/cmd/skopeo/signing.go b/cmd/skopeo/signing.go
@@ -116,11 +116,15 @@ func (opts *standaloneVerifyOptions) run(args []string, stdout io.Writer) error
 			return fmt.Errorf("Error reading public keys from %s: %w", opts.publicKeyFile, err)
 		}
 		mech, publicKeyfingerprints, err = signature.NewEphemeralGPGSigningMechanism(publicKeys)
+		if err != nil {
+			return fmt.Errorf("Error initializing GPG: %w", err)
+
+		}
 	} else {
 		mech, err = signature.NewGPGSigningMechanism()
-	}
-	if err != nil {
-		return fmt.Errorf("Error initializing GPG: %w", err)
+		if err != nil {
+			return fmt.Errorf("Error initializing GPG: %w", err)
+		}
 	}
 	defer mech.Close()