SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: in confirm_spawn, the meaning of 'n' and 's' choices are confusing

Browse Source 
Before this patch we had:

 - "no" which gives "failing execution" but the command is actually assumed as
   succeed.

 - "skip" which gives "skipping", but the command is assumed to have failed,
   which ends up with "Failed to start ..." on the console.

Now we have:

 - "fail" which gives "failing execution" and the command is indeed assumed as
   failed.

 - "skip" which gives "skipping execution" and the command is assumed as
   succeed.
This commit is contained in:
Franck Bui
2016-11-17 18:16:49 +01:00
parent 3b20f877ad
commit 2bcc330942
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execute.c
+4 -4
View File
@@ -731,7 +731,7 @@ static int ask_for_confirmation(const char *vc, const char *cmdline) {
return CONFIRM_EXECUTE;
}
r = ask_char(&c, "yns", "Execute %s? [Yes, No, Skip] ", cmdline);
r = ask_char(&c, "yfs", "Execute %s? [Yes, Fail, Skip] ", cmdline);
if (r < 0) {
write_confirm_error_fd(r, STDOUT_FILENO);
r = CONFIRM_EXECUTE;
@@ -739,13 +739,13 @@ static int ask_for_confirmation(const char *vc, const char *cmdline) {
}
switch (c) {
case 'n':
case 'f':
printf("Failing execution.\n");
r = CONFIRM_PRETEND_SUCCESS;
r = CONFIRM_PRETEND_FAILURE;
break;
case 's':
printf("Skipping execution.\n");
r = CONFIRM_PRETEND_FAILURE;
r = CONFIRM_PRETEND_SUCCESS;
break;
case 'y':
r = CONFIRM_EXECUTE;