August 2020 - Pacman-contrib - lists.archlinux.org

[PATCH] pactree: Compress self-provided optional dependencies
by Sebastian Jakubiak 02 Sep '20

02 Sep '20

Remove `provides X` from `X provides X: ...` lines describing optional dependencies to make the output more compact. Signed-off-by: Sebastian Jakubiak <jakseb.dev(a)gmail.com> --- I noticed that most optional dependencies in the output of `pactree --optional` have this unneeded repetition. With this patch the following: vim-runtime ├─bash provides sh: support for some tools and macros (optional) ├─python provides python: demoserver example tool (optional) └─gawk provides gawk: mve tools upport (optional) will change to: vim-runtime ├─bash provides sh: support for some tools and macros (optional) ├─python: demoserver example tool (optional) └─gawk: mve tools upport (optional) src/pactree.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pactree.c b/src/pactree.c index e34ecc8..4bd4601 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -383,6 +383,14 @@ static int parse_options(int argc, char *argv[]) return 0; } +int pkg_provides_itself(const char *pkg, const char *depstring) +{ + size_t pkglen = strlen(pkg); + return (strncmp(pkg, depstring, pkglen) == 0 && + (depstring[pkglen] == '\0' || + strncmp(": ", depstring + pkglen, 2) == 0)); +} + /* pkg provides provision */ static void print_text(const char *pkg, const char *provision, tdepth *depth, int last, int opt_dep) @@ -419,12 +427,12 @@ static void print_text(const char *pkg, const char *provision, if(!pkg && provision) { printf("%s%s%s%s [unresolvable]%s%s\n", tip, color->leaf1, provision, color->branch1, opt_str, color->off); - } else if(provision && strcmp(pkg, provision) != 0 && *(style->provides) != '\0') { + } else if(provision && *(style->provides) != '\0' && !pkg_provides_itself(pkg, provision)) { printf("%s%s%s%s%s %s%s%s%s\n", tip, color->leaf1, pkg, color->leaf2, style->provides, color->leaf1, provision, opt_str, color->off); } else { - printf("%s%s%s%s%s\n", tip, color->leaf1, pkg, opt_str, color->off); + printf("%s%s%s%s%s\n", tip, color->leaf1, (provision ? provision : pkg), opt_str, color->off); } } -- 2.27.0

3 3

[PATCH] doc: Fix minor mistakes in manpages
by Sebastian Jakubiak 02 Sep '20

02 Sep '20

Signed-off-by: Sebastian Jakubiak <jakseb.dev(a)gmail.com> --- doc/checkupdates.8.txt | 2 +- doc/pacsort.8.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/checkupdates.8.txt b/doc/checkupdates.8.txt index b1a94d8..14cecc4 100644 --- a/doc/checkupdates.8.txt +++ b/doc/checkupdates.8.txt @@ -41,7 +41,7 @@ Environment Errors ------ -On exit, checkpkg will return one of the following error codes. +On exit, checkupdates will return one of the following error codes. 0:: Normal exit condition. diff --git a/doc/pacsort.8.txt b/doc/pacsort.8.txt index 357664d..e0fa5d4 100644 --- a/doc/pacsort.8.txt +++ b/doc/pacsort.8.txt @@ -27,7 +27,7 @@ By default the lines are treated as lists of plain version strings. Options ------- *-f, \--files*:: - If the input lists are in the format '\*-*.pkg.tar*', sort lines by pkgname and pkgver. + If the input lists are in the format '\*-\*.pkg.tar*', sort lines by pkgname and pkgver. *-h, \--help*:: Display syntax and command line options. -- 2.27.0

2 1

[PATCH] pactree: Fix vertical limbs for --optional
by Sebastian Jakubiak 02 Sep '20

02 Sep '20

When pactree was run with -o/--optional turned on, limbs were sometimes not properly cut off for the last children of packages that had no optional dependencies. Example: $ pactree -a -d2 -o libluv libluv |-luajit | `-gcc-libs `-libuv | |-glibc | `-libnsl Signed-off-by: Sebastian Jakubiak <jakseb.dev(a)gmail.com> --- src/pactree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pactree.c b/src/pactree.c index e34ecc8..cf05519 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -540,7 +540,7 @@ static void print_dep_list(alpm_list_t *deps, alpm_list_t *dblist, alpm_pkg_t *p }; depth->next = &d; /* last dep, cut off the limb here */ - if((last && optional && opt_dep) || (last && !optional)) { + if(last) { if(depth->prev) { depth->prev->next = &d; d.prev = depth->prev; -- 2.27.0

2 1