repart: merge common conditions

No functional change, just refactoring.

diff --git a/src/repart/repart.c b/src/repart/repart.c
index 5ae14b32181ad30aa38d7e5127d0e8fb9f8e22b4..fbfa52c223adacae97b60aa06a267b62a2bcd3d6 100644 (file)
--- a/src/repart/repart.c
+++ b/src/repart/repart.c
@@ -5580,13 +5580,15 @@ static int partition_format_verity_sig(Context *context, Partition *p) {
 
         verity_settings = lookup_verity_settings_by_uuid_pair(rp->current_uuid, hp->current_uuid);
 
-        if (!context->private_key && !verity_settings)
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Verity signature partition signing requested but no private key provided (--private-key=).");
+        if (!verity_settings) {
+                if (!context->private_key)
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                               "Verity signature partition signing requested but no private key provided (--private-key=).");
 
-        if (!context->certificate && !verity_settings)
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Verity signature partition signing requested but no PEM certificate provided (--certificate=).");
+                if (!context->certificate)
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                               "Verity signature partition signing requested but no PEM certificate provided (--certificate=).");
+        }
 
         (void) partition_hint(p, context->node, &hint);