chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: honor --no-legend in 'list-jobs'
[elogind.git]
/
src
/
systemctl
/
systemctl.c
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index 0e833ab538ba1e91f4891100ae03dd4a9fe76843..737cd67d6814b12f1706e009bbe58c0f3536b9ae 100644
(file)
--- a/
src/systemctl/systemctl.c
+++ b/
src/systemctl/systemctl.c
@@
-1445,11
+1445,12
@@
static void output_jobs_list(const struct job_info* jobs, unsigned n) {
shorten = true;
}
shorten = true;
}
- printf("%*s %-*s %-*s %-*s\n",
- id_len, "JOB",
- unit_len, "UNIT",
- type_len, "TYPE",
- state_len, "STATE");
+ if (!arg_no_legend)
+ printf("%*s %-*s %-*s %-*s\n",
+ id_len, "JOB",
+ unit_len, "UNIT",
+ type_len, "TYPE",
+ state_len, "STATE");
for (j = jobs; j < jobs + n; j++) {
_cleanup_free_ char *e = NULL;
for (j = jobs; j < jobs + n; j++) {
_cleanup_free_ char *e = NULL;
@@
-1468,10
+1469,12
@@
static void output_jobs_list(const struct job_info* jobs, unsigned n) {
on, state_len, j->state, off);
}
on, state_len, j->state, off);
}
- on = ansi_highlight();
- off = ansi_highlight_off();
+ if (!arg_no_legend) {
+ on = ansi_highlight();
+ off = ansi_highlight_off();
- printf("\n%s%u jobs listed%s.\n", on, n, off);
+ printf("\n%s%u jobs listed%s.\n", on, n, off);
+ }
}
static int list_jobs(sd_bus *bus, char **args) {
}
static int list_jobs(sd_bus *bus, char **args) {
@@
-3845,7
+3848,7
@@
static int set_property(sd_bus *bus, char **args) {
if (r < 0)
return bus_log_create_error(r);
if (r < 0)
return bus_log_create_error(r);
- r = sd_bus_
send_with_reply_and_block(bus, m, -1
, &error, NULL);
+ r = sd_bus_
call(bus, m, 0
, &error, NULL);
if (r < 0) {
log_error("Failed to set unit properties on %s: %s", n, bus_error_message(&error, r));
return r;
if (r < 0) {
log_error("Failed to set unit properties on %s: %s", n, bus_error_message(&error, r));
return r;
@@
-4132,7
+4135,7
@@
static int set_environment(sd_bus *bus, char **args) {
if (r < 0)
return bus_log_create_error(r);
if (r < 0)
return bus_log_create_error(r);
- r = sd_bus_
send_with_reply_and_block(bus, m, -1
, &error, NULL);
+ r = sd_bus_
call(bus, m, 0
, &error, NULL);
if (r < 0) {
log_error("Failed to set environment: %s", bus_error_message(&error, r));
return r;
if (r < 0) {
log_error("Failed to set environment: %s", bus_error_message(&error, r));
return r;
@@
-4443,7
+4446,7
@@
static int enable_unit(sd_bus *bus, char **args) {
return bus_log_create_error(r);
}
return bus_log_create_error(r);
}
- r = sd_bus_
send_with_reply_and_block(bus, m, -
0, &error, &reply);
+ r = sd_bus_
call(bus, m,
0, &error, &reply);
if (r < 0) {
log_error("Failed to execute operation: %s", bus_error_message(&error, r));
return r;
if (r < 0) {
log_error("Failed to execute operation: %s", bus_error_message(&error, r));
return r;