From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 10 Oct 2023 14:05:28 +0000 (+0200)
Subject: dissect: don't show non-JSON arch + sector size in JSON mode
X-Git-Tag: v255-rc1~284
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66cd3537f9c27818993de4cd9360283cbdb8293c;p=thirdparty%2Fsystemd.git

dissect: don't show non-JSON arch + sector size in JSON mode
---

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 0b4c5ba22fe..c84325620bb 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -836,15 +836,15 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) {
         else if (arg_json_format_flags & JSON_FORMAT_OFF)
                 printf("      Size: %s\n", FORMAT_BYTES(size));
 
-        printf(" Sec. Size: %" PRIu32 "\n", m->sector_size);
+        if (arg_json_format_flags & JSON_FORMAT_OFF) {
+                printf(" Sec. Size: %" PRIu32 "\n", m->sector_size);
 
-        printf("     Arch.: %s\n",
-               strna(architecture_to_string(dissected_image_architecture(m))));
+                printf("     Arch.: %s\n",
+                       strna(architecture_to_string(dissected_image_architecture(m))));
 
-        if (arg_json_format_flags & JSON_FORMAT_OFF)
                 putc('\n', stdout);
-
-        fflush(stdout);
+                fflush(stdout);
+        }
 
         r = dissected_image_acquire_metadata(m, 0);
         if (r == -ENXIO)