system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-01 13:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31721 from aafeijoo-suse/service-util-help-fix

Browse source 
shared/service-util: actually use the `bus_introspect` argument in `help()`
This commit is contained in:
Luca Boccassi 2024-03-11 18:13:57 +00:00 committed by GitHub
parent 4a052a718a 4313b99136
commit b6fb31be45
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/creds/creds.c
View file

@ -742,12 +742,13 @@ static int verb_help(int argc, char **argv, void *userdata) {
" --user Select user-scoped credential encryption\n"
" --uid=UID Select user for scoped credentials\n"
" -q --quiet Suppress output for 'has-tpm2' verb\n"
"\nSee the %2$s for details.\n"
, program_invocation_short_name
, link
, ansi_underline(), ansi_normal()
, ansi_highlight(), ansi_normal()
);
"\nSee the %2$s for details.\n",
program_invocation_short_name,
link,
ansi_underline(),
ansi_normal(),
ansi_highlight(),
ansi_normal());
return 0;
}

25
src/shared/service-util.c
View file

@ -17,19 +17,22 @@ static int help(const char *program_path, const char *service, const char *descr
if (r < 0)
return log_oom();
printf("%s [OPTIONS...]\n\n"
"%s%s%s\n\n"
"This program takes no positional arguments.\n\n"
"%sOptions%s:\n"
printf("%1$s [OPTIONS...]\n"
"\n%5$s%7$s%6$s\n"
"\nThis program takes no positional arguments.\n"
"\n%3$sOptions:%4$s\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --bus-introspect=PATH Write D-Bus XML introspection data\n"
"\nSee the %s for details.\n"
, program_path
, ansi_highlight(), description, ansi_normal()
, ansi_underline(), ansi_normal()
, link
);
"%8$s"
"\nSee the %2$s for details.\n",
program_path,
link,
ansi_underline(),
ansi_normal(),
ansi_highlight(),
ansi_normal(),
description,
bus_introspect ? " --bus-introspect=PATH Write D-Bus XML introspection data\n" : "");
return 0; /* No further action */
}

13
src/sysupdate/sysupdate.c
View file

@ -1221,12 +1221,13 @@ static int verb_help(int argc, char **argv, void *userdata) {
" --no-legend Do not show the headers and footers\n"
" --json=pretty|short|off\n"
" Generate JSON output\n"
"\nSee the %2$s for details.\n"
, program_invocation_short_name
, link
, ansi_underline(), ansi_normal()
, ansi_highlight(), ansi_normal()
);
"\nSee the %2$s for details.\n",
program_invocation_short_name,
link,
ansi_underline(),
ansi_normal(),
ansi_highlight(),
ansi_normal());
return 0;
}