July 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

Remarks on the --optional feature of pactree
by Sebastian Jakubiak 31 Jul '20

31 Jul '20

Hello, I would like to share my thoughts on how `pactree --optional` works. First thing: shouldn't it omit uninstalled optional dependencies when asked to query the local database (no -s/--sync)? There was a comment by Johannes Löthberg on an earlier attempt to implement --optional: > The problem is that while it works fine for -so, when searching for > local packages it should properly exclude optional dependencies that are > not installed so they're not printed, rather than being printed as > unresolvable. (source: https://lists.archlinux.org/pipermail/pacman-contrib/2020-May/000274.html) So for example here: $ pactree -d1 -o python2-urllib3 python2-urllib3 ├─python2 ├─python2-pysocks: SOCKS support [unresolvable] (optional) └─python2-pyopenssl provides python2-pyopenssl: security support (optional) python2-pysocks should be skipped, shouldn't it? Second: default value of DEPTH (optional argument of -o/--optional). I think that infinity (-1) would have been a better choice than 1. In other words, no depth specified should mean no depth limiting. The function of the switch could then be described like so: --optional[=DEPTH] also list optional dependencies, optionally stopping at DEPTH This would be kind of analogous to how 'normal' depth works -- unlimited unless --depth=N is passed. Also, it may sound silly but -o1 feels slightly easier to type if need be / looks less strange than -o-1. But I guess that other people's views on this matter might differ from mine. Plus, it is maybe too late anyway to change the behavior of the feature since a release containing it has been made. I should have raised my concerns earlier.

3 3

[PATCH] pactree: Fix tree drawing for --optional
by Sebastian Jakubiak 30 Jul '20

30 Jul '20

Example of an incorrect behavior: $ pactree -a -d1 -o dia dia |-libxslt `-gtk2 `-python2 (optional) The last non-optional dependency, gtk2, has its limb drawn as if it were the last child of a node, even though an optional dependency follows. Signed-off-by: Sebastian Jakubiak <jakseb.dev(a)gmail.com> --- src/pactree.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/pactree.c b/src/pactree.c index 39328e7..e34ecc8 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -505,7 +505,7 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int r /** * print the dependency list given, passing the optional parameter when required */ -static void print_dep_list(alpm_list_t *deps, alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int rev, int optional, int opt_dep) +static void print_dep_list(alpm_list_t *deps, alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int rev, int optional, int opt_dep, int final) { alpm_list_t *i; int new_optional; @@ -520,7 +520,7 @@ static void print_dep_list(alpm_list_t *deps, alpm_list_t *dblist, alpm_pkg_t *p for(i = deps; i; i = alpm_list_next(i)) { const char *pkgname = i->data; - int last = alpm_list_next(i) ? 0 : 1; + int last = final && (alpm_list_next(i) ? 0 : 1); alpm_pkg_t *dep_pkg = alpm_find_dbs_satisfier(handle, dblist, pkgname); @@ -561,7 +561,7 @@ static void print_dep_list(alpm_list_t *deps, alpm_list_t *dblist, alpm_pkg_t *p */ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int rev, int optional) { - alpm_list_t *deps; + alpm_list_t *deps, *optdeps; if(!pkg || ((max_depth >= 0) && (depth->level > max_depth))) { return; @@ -575,21 +575,20 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int r deps = get_pkg_deps(pkg); } - print_dep_list(deps, dblist, pkg, depth, rev, optional, 0); - - FREELIST(deps); - + optdeps = NULL; if(optional){ if(rev) { - deps = alpm_pkg_compute_optionalfor(pkg); + optdeps = alpm_pkg_compute_optionalfor(pkg); } else { - deps = get_pkg_optdeps(pkg); + optdeps = get_pkg_optdeps(pkg); } + } - print_dep_list(deps, dblist, pkg, depth, rev, optional, 1); + print_dep_list(deps, dblist, pkg, depth, rev, optional, 0, !optdeps); + FREELIST(deps); - FREELIST(deps); - } + print_dep_list(optdeps, dblist, pkg, depth, rev, optional, 1, 1); + FREELIST(optdeps); } int main(int argc, char *argv[]) -- 2.27.0

2 1

[GIT] branch master updated (d682a05 -> 4e1943a)
by Daniel M. Capella 30 Jul '20

30 Jul '20

This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from d682a05 Release v1.4.0 new 4e1943a pactree: Fix tree drawing for --optional The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 4e1943a (HEAD -> master) pactree: Fix tree drawing for --optional Detailed log of new commits: commit 4e1943a4fba8d94278a1b356319d0f0674d81b12 Author: Sebastian Jakubiak <jakseb.dev(a)gmail.com> Date: Thu Jul 30 01:30:54 2020 +0200 pactree: Fix tree drawing for --optional Example of an incorrect behavior: $ pactree -a -d1 -o dia dia |-libxslt `-gtk2 `-python2 (optional) The last non-optional dependency, gtk2, has its limb drawn as if it were the last child of a node, even though an optional dependency follows. Signed-off-by: Sebastian Jakubiak <jakseb.dev(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Summary of changes: src/pactree.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[GIT] annotated tag v1.4.0 created (now 4f287fc)
by Daniel M. Capella 29 Jul '20

29 Jul '20

This is an automated email from the git hooks/post-receive script. polyzen pushed a change to annotated tag v1.4.0 in repository pacman-contrib. at 4f287fc (tag) tagging d682a05082cd93e622b4a099775adc99c5d010fe (commit) replaces v1.3.0 by Daniel M. Capella on Tue Jul 28 20:34:05 2020 -0400 - Log ----------------------------------------------------------------- v1.4.0 -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEEBNw/sURf7KgTwn766k97MhqQatkFAl8gw/0WHHBvbHl6ZW5A YXJjaGxpbnV4Lm9yZwAKCRDqT3syGpBq2bO9D/9Mxt8etqX+iWqZiBNQJIBwBEh5 rsgGmbBie5chg4nf8UE+lhDbTxHuC1aQXtY+/VhfbEk/nRbkI80ewcnfzgtdMUed JOTmqmU1j+0u2Gk+N2DMQwtkfK6u0T3JqXbdfhrSUzTqk7tjBklI8TPgKqmJ2ZvO mnkZivM9mIS/bgmeQxERr61LH4DAH4azMLV/3mcmAkKV9MyWNLNuEydIPWrLRZWz AEXy+SMexOaY09gO6GNhsbDHc7mperhiqalPdPNP1uxb3qgk3fNmp8OPhC+cTDDT hUH+SMTXSrYlCV9fkXt6XeBUdUFpX4BR0hKdf8T1tujZtSL8RkZyW8itf+TAIoRV NlMqgHa6S5uKk+1YOhnhs7aDaDEClpJ2SyBGj0e9VcMJHUUfB9WPnu+QJ0JhZ+II J8n7T+tET9PHs4FEuVfFC9t39GWSYQnuCiH4k+8yQ1xm31TZn1DuRzQvkV6cF96C z6NxWMRyRZUutcxdAkXA4k3UwxBTeOS9tgaLmgDTd6AHdyAZpNjCEuQWW5ydzzxH LnI4OMgiS3cXCGXy+DklXIiN3mOrA4XmYx79Doq6gLeJkAQAqQsmctO/Tx2a3P7A fa2Rj0YH2vcFEXYM2PfcVHH6HQgb45r9F2cRPT97VMdGYcaLjEGtob78FLiZkwkb p/5KK9MFCeefS8OxWw== =JCFD -----END PGP SIGNATURE----- Daniel M. Capella (6): doc: Update email in footer doc: Fix pacdiff option descriptions vim: Add missing highlight links for b2sums CHANGES.md: Update for v1.4.0 doc/release: Add steps for the Unreleased section Release v1.4.0 Edward E (2): pactree: Add --debug pactree: Add --gpgdir, set the gpg directory Johannes Löthberg (1): paccache.service.in: Reword description to more clearly specify what it does Jonas Witschel (1): doc: make timestamps in man pages reproducible Leonid Bloch (1): paccache: Support cleaning many thousands of candidates Sebastian Jakubiak (2): pactree: Improve command line validation pactree: Fix redundant arrows in Graphviz output Will Song (1): introduce the --optional flag (FS#61336) ----------------------------------------------------------------------- This annotated tag includes the following new commits: new 8792eb5 CHANGES.md: Update for v1.4.0 new 8046c4a doc/release: Add steps for the Unreleased section new d682a05 Release v1.4.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * d682a05 (HEAD -> master, tag: v1.4.0) Release v1.4.0 * 8046c4a doc/release: Add steps for the Unreleased section * 8792eb5 CHANGES.md: Update for v1.4.0 Detailed log of new commits: commit d682a05082cd93e622b4a099775adc99c5d010fe Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Tue Jul 28 20:33:05 2020 -0400 Release v1.4.0 Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit 8046c4a429fb985b123430e6cccfbc69f1ed5d17 Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Tue Jul 28 20:00:27 2020 -0400 doc/release: Add steps for the Unreleased section Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit 8792eb5390c391921664ca73aee427324e68e2cb Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Tue Jul 28 18:31:42 2020 -0400 CHANGES.md: Update for v1.4.0 Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[GIT] branch master updated (269a2cd -> d682a05)
by Daniel M. Capella 29 Jul '20

29 Jul '20

This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from 269a2cd paccache.service.in: Reword description to more clearly specify what it does new 8792eb5 CHANGES.md: Update for v1.4.0 new 8046c4a doc/release: Add steps for the Unreleased section new d682a05 Release v1.4.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * d682a05 (HEAD -> master, tag: v1.4.0) Release v1.4.0 * 8046c4a doc/release: Add steps for the Unreleased section * 8792eb5 CHANGES.md: Update for v1.4.0 Detailed log of new commits: commit d682a05082cd93e622b4a099775adc99c5d010fe Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Tue Jul 28 20:33:05 2020 -0400 Release v1.4.0 Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit 8046c4a429fb985b123430e6cccfbc69f1ed5d17 Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Tue Jul 28 20:00:27 2020 -0400 doc/release: Add steps for the Unreleased section Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit 8792eb5390c391921664ca73aee427324e68e2cb Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Tue Jul 28 18:31:42 2020 -0400 CHANGES.md: Update for v1.4.0 Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Summary of changes: CHANGES.md | 23 +++++++++++++++++++++-- configure.ac | 2 +- doc/release-procedure.txt | 10 +++++++--- 3 files changed, 29 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[GIT] branch master updated (e2a5e43 -> 269a2cd)
by Daniel M. Capella 28 Jul '20

28 Jul '20

This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from e2a5e43 doc: make timestamps in man pages reproducible new 269a2cd paccache.service.in: Reword description to more clearly specify what it does The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 269a2cd (HEAD -> master) paccache.service.in: Reword description to more clearly specify what it does Detailed log of new commits: commit 269a2cdc38575c5a570c8929e6e6fbcc2f1b6d8d Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Tue Jul 28 21:34:51 2020 +0200 paccache.service.in: Reword description to more clearly specify what it does This makes log lines in the journal a bit more obvious. Reported-by: Stephen Day <sd(a)unixtastic.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Summary of changes: src/paccache.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH] paccache.service.in: Reword description to more clearly specify what it does
by Johannes Löthberg 28 Jul '20

28 Jul '20

This makes log lines in the journal a bit more obvious. Reported-by: Stephen Day <sd(a)unixtastic.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- src/paccache.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paccache.service.in b/src/paccache.service.in index 919bf74..cd28e67 100644 --- a/src/paccache.service.in +++ b/src/paccache.service.in @@ -1,5 +1,5 @@ [Unit] -Description=Discard unused packages +Description=Remove unused cached package files [Service] Type=oneshot -- 2.27.0

1 0

[PATCH] doc: make timestamps in man pages reproducible
by Jonas Witschel 28 Jul '20

28 Jul '20

Replace the custom "pacman_contrib_date" attribute by the built-in "localtime" since both have the same format, but the latter respects the SOURCE_DATE_EPOCH specification for reproducible builds. --- doc/Makefile.am | 1 - doc/asciidoc.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 52f2bf7..374b1b5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -78,7 +78,6 @@ pkgdatadir = ${datadir}/${PACKAGE} ASCIIDOC_OPTS = \ -f $(srcdir)/asciidoc.conf \ -a pacman_contrib_version="$(REAL_PACKAGE_VERSION)" \ - -a pacman_contrib_date="`date +%Y-%m-%d`" \ -a pkgdatadir=$(pkgdatadir) \ -a localstatedir=$(localstatedir) \ -a sysconfdir=$(sysconfdir) diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index 0d2ea98..9314ea8 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -50,7 +50,7 @@ ifdef::backend-docbook[] template::[header-declarations] <refentry> <refentryinfo> -<date>{pacman_contrib_date}</date> +<date>{localdate}</date> </refentryinfo> <refmeta> <refentrytitle>{mantitle}</refentrytitle> -- 2.27.0

2 3

[GIT] branch master updated (b6d08b4 -> e2a5e43)
by Daniel M. Capella 28 Jul '20

28 Jul '20

This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from b6d08b4 introduce the --optional flag (FS#61336) new e2a5e43 doc: make timestamps in man pages reproducible The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * e2a5e43 (HEAD -> master) doc: make timestamps in man pages reproducible Detailed log of new commits: commit e2a5e43bd2958efd5af72330c584d7ca73daf164 Author: Jonas Witschel <diabonas(a)archlinux.org> Date: Tue Jul 28 09:11:59 2020 +0200 doc: make timestamps in man pages reproducible Replace the custom "pacman_contrib_date" attribute by the built-in "localtime" since both have the same format, but the latter respects the SOURCE_DATE_EPOCH specification for reproducible builds. Signed-off-by: Jonas Witschel <diabonas(a)archlinux.org> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Summary of changes: doc/Makefile.am | 1 - doc/asciidoc.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0