picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: include the unit name when notifying that a confirmation question timed out

Browse source
This commit is contained in:
Franck Bui 2016-11-10 10:07:42 +01:00
parent b0eb29449e
commit 63d77c9254
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/execute.c
View file

@ -669,18 +669,18 @@ static int setup_confirm_stdio(const char *vc, int *_saved_stdin, int *_saved_st
return 0; return 0;
} }
static void write_confirm_error_fd(int err, int fd) { static void write_confirm_error_fd(int err, int fd, const Unit *u) {
assert(err < 0); assert(err < 0);
if (err == -ETIMEDOUT) if (err == -ETIMEDOUT)
dprintf(fd, "Confirmation question timed out, assuming positive response.\n"); dprintf(fd, "Confirmation question timed out for %s, assuming positive response.\n", u->id);
else { else {
errno = -err; errno = -err;
dprintf(fd, "Couldn't ask confirmation: %m, assuming positive response.\n"); dprintf(fd, "Couldn't ask confirmation for %s: %m, assuming positive response.\n", u->id);
} }
} }
static void write_confirm_error(int err, const char *vc) { static void write_confirm_error(int err, const char *vc, const Unit *u) {
_cleanup_close_ int fd = -1; _cleanup_close_ int fd = -1;
assert(vc); assert(vc);
@ -689,7 +689,7 @@ static void write_confirm_error(int err, const char *vc) {
if (fd < 0) if (fd < 0)
return; return;
write_confirm_error_fd(err, fd); write_confirm_error_fd(err, fd, u);
} }
static int restore_confirm_stdio(int *saved_stdin, int *saved_stdout) { static int restore_confirm_stdio(int *saved_stdin, int *saved_stdout) {
@ -728,7 +728,7 @@ static int ask_for_confirmation(const char *vc, Unit *u, const char *cmdline) {
/* For any internal errors, assume a positive response. */ /* For any internal errors, assume a positive response. */
r = setup_confirm_stdio(vc, &saved_stdin, &saved_stdout); r = setup_confirm_stdio(vc, &saved_stdin, &saved_stdout);
if (r < 0) { if (r < 0) {
write_confirm_error(r, vc); write_confirm_error(r, vc, u);
return CONFIRM_EXECUTE; return CONFIRM_EXECUTE;
} }
@ -748,7 +748,7 @@ static int ask_for_confirmation(const char *vc, Unit *u, const char *cmdline) {
for (;;) { for (;;) {
r = ask_char(&c, "yfshiDjc", "Execute %s? [y, f, s – h for help] ", e); r = ask_char(&c, "yfshiDjc", "Execute %s? [y, f, s – h for help] ", e);
if (r < 0) { if (r < 0) {
write_confirm_error_fd(r, STDOUT_FILENO); write_confirm_error_fd(r, STDOUT_FILENO, u);
r = CONFIRM_EXECUTE; r = CONFIRM_EXECUTE;
goto restore_stdio; goto restore_stdio;
} }