From 909f2e86c38cf8c83bb81d0a5d587815a2ab6d58 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Fri, 16 Sep 2022 11:15:30 +0200 Subject: [PATCH] util.c: add "%O" to --print-format Add the option to print optional depends with "%O". Signed-off-by: Jelle van der Waa --- doc/pacman.8.asciidoc | 4 ++-- src/pacman/util.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index 812fddab..cd573d57 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -240,8 +240,8 @@ Transaction Options (apply to '-S', '-R' and '-U') "%g" for base64 encoded PGP signature, "%h" for sha256sum, "%n" for pkgname, "%p" for packager, "%v" for pkgver, "%l" for location, "%r" for repository, "%s" for size, "%C" for checkdepends, "%D" for depends, - "%L" for licenses, and "%M" for makedepends, "%P" for provides and - "%R" for replaces. + "%L" for licenses, and "%M" for makedepends, "%O" for optional depends, + "%P" for provides and "%R" for replaces. Implies '\--print'. diff --git a/src/pacman/util.c b/src/pacman/util.c index bd901e07..1b5a68d9 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1279,6 +1279,15 @@ void print_packages(const alpm_list_t *packages) free(temp); temp = string; } + /* %O : optional */ + if(strstr(temp, "%O")) { + alpm_list_t *lst = alpm_pkg_get_optdepends(pkg); + char *depends = concat_list(lst, (formatfn)alpm_dep_compute_string); + string = strreplace(temp, "%O", depends); + free(depends); + free(temp); + temp = string; + } /* %P : provides */ if(strstr(temp, "%P")) { alpm_list_t *lst = alpm_pkg_get_provides(pkg);