Merge branch 'master' of ssh://git.freedesktop.org/git/systemd

2010-07-11 03:49:22 +02:00
parent b12c1e7cf7 17bb73821c
commit dce3acd2e2
1 changed files with 3 additions and 3 deletions
@@ -1100,9 +1100,6 @@ static void print_status_info(UnitStatusInfo *i) {
        else if (i->what)
                printf("\t    What: %s\n", i->what);

-        if (i->status_text)
-                printf("\t  Status: \"%s\"\n", i->status_text);
-
        if (i->accept)
                printf("\tAccepted: %u; Connected: %u\n", i->n_accepted, i->n_connections);

@@ -1175,6 +1172,9 @@ static void print_status_info(UnitStatusInfo *i) {
                printf("\n");
        }

+        if (i->status_text)
+                printf("\t  Status: \"%s\"\n", i->status_text);
+
        if (i->default_control_group) {
                unsigned c;