busctl: fix 'command line' style output of properties

diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c
index 1ba4e8adacfe0b7f83495989f9a01175fc8b772e..dd6ae865b66958ccfb3408b4077014c29a3708fb 100644 (file)
--- a/src/libsystemd/sd-bus/busctl.c
+++ b/src/libsystemd/sd-bus/busctl.c
@@ -538,7 +538,7 @@ static int format_cmdline(sd_bus_message *m, FILE *f, bool needs_space) {
                                 fprintf(f, "%s", contents);
                         }
 
                                 fprintf(f, "%s", contents);
                         }
 

-                        r = format_cmdline(m, f, true);
+                        r = format_cmdline(m, f, needs_space || IN_SET(type, SD_BUS_TYPE_ARRAY, SD_BUS_TYPE_VARIANT));

                         if (r < 0)
                                 return r;
 
                         if (r < 0)
                                 return r;
 


@@ -614,6 +614,7 @@ static int format_cmdline(sd_bus_message *m, FILE *f, bool needs_space) {
                         assert_not_reached("Unknown basic type.");
                 }
 
                         assert_not_reached("Unknown basic type.");
                 }
 

+                needs_space = true;

         }
 }
 
         }
 }