diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2013-02-27 22:52:43 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2013-02-28 02:23:27 +0100 |
| commit | 984a2be450abac81474889b8bea4b3fbeddb26c5 (patch) | |
| tree | c6476cd51f3335afb6275c3d8bfd503127c0db9f /src/core | |
| parent | 297d0749dd82ea2442203d53c23ee401bdf46fca (diff) | |
util, core: add support for ephemeral status lines
Ephemeral status lines do not end with a newline and they expect to be
overwritten by the next printed status line.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/job.c | 2 | ||||
| -rw-r--r-- | src/core/manager.c | 4 | ||||
| -rw-r--r-- | src/core/manager.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/job.c b/src/core/job.c index 9f792b84fd..90de550016 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -649,7 +649,7 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) { case JOB_FAILED: unit_status_printf(u, ANSI_HIGHLIGHT_RED_ON "FAILED" ANSI_HIGHLIGHT_OFF, format); - manager_status_printf(u->manager, NULL, "See 'systemctl status %s' for details.", u->id); + manager_status_printf(u->manager, false, NULL, "See 'systemctl status %s' for details.", u->id); break; case JOB_DEPENDENCY: diff --git a/src/core/manager.c b/src/core/manager.c index 1dac69b791..c6f13f7d5a 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2494,7 +2494,7 @@ static bool manager_get_show_status(Manager *m) { return plymouth_running(); } -void manager_status_printf(Manager *m, const char *status, const char *format, ...) { +void manager_status_printf(Manager *m, bool ephemeral, const char *status, const char *format, ...) { va_list ap; if (!manager_get_show_status(m)) @@ -2504,7 +2504,7 @@ void manager_status_printf(Manager *m, const char *status, const char *format, . return; va_start(ap, format); - status_vprintf(status, true, format, ap); + status_vprintf(status, true, ephemeral, format, ap); va_end(ap); } diff --git a/src/core/manager.h b/src/core/manager.h index d21f27dfd4..0d0255289a 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -293,6 +293,6 @@ void manager_undo_generators(Manager *m); void manager_recheck_journal(Manager *m); void manager_set_show_status(Manager *m, bool b); -void manager_status_printf(Manager *m, const char *status, const char *format, ...); +void manager_status_printf(Manager *m, bool ephemeral, const char *status, const char *format, ...); void watch_init(Watch *w); |