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

[PATCH 1/3] paccache: Clarify sudo usage
by Daniel M. Capella 25 Nov '20

25 Nov '20

"Privilege escalation required" sounds more like an error. Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> --- src/paccache.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/paccache.sh.in b/src/paccache.sh.in index 1311fd7..fa53d58 100644 --- a/src/paccache.sh.in +++ b/src/paccache.sh.in @@ -138,11 +138,11 @@ m4_include(../lib/size_to_human.sh) runcmd() { if (( needsroot && EUID != 0 )); then - msg "Privilege escalation required" + msg 'Escalating privileges using sudo' if sudo -v &>/dev/null && sudo -l &>/dev/null; then sudo "$@" else - die 'Unable to escalate privileges using sudo' + die 'Failed to escalate' fi else "$@" -- 2.28.0

2 6

Ideas for new functionality in pacdiff
by John A. Leuenhagen 05 Oct '20

05 Oct '20

Hello, I recently discovered pacdiff, which has proved to be an simple, excellent tool for taking care of pacfiles. There are a couple minor improvements I thought of, and would like to hear opinions on them before writing a patch. Currently, before pacdiff asks for the user's choice of action, it will compare the original file to the pacfile. If the files are identical, it will delete the pacfile. My idea is to perform this check after the user views the diff. This way, the user may merge all changes with their DIFFPROG, and the pacfile will automatically be deleted when they close their editor. If the files still differ, functionality would remain the same as it is currently. The second idea is simply a way to swap the sides that the files appear on in DIFFPROG. Personally, I would prefer having the pacfile on the right, but it is currently on the left. Having an argument for this seems reasonable to me. These would both be very simple changes, but would make the program a lot nicer, for me at least. Thanks, John Leuenhagen

2 2

[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

[GIT] branch master updated (4e1943a -> bc82ef5)
by Daniel M. Capella 02 Sep '20

02 Sep '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 4e1943a pactree: Fix tree drawing for --optional new ea49cf3 pactree: Fix vertical limbs for --optional new 1f1245e doc: Fix minor mistakes in manpages new bc82ef5 pactree: Hide dependency satisfiers in more cases 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: * bc82ef5 (HEAD -> master) pactree: Hide dependency satisfiers in more cases * 1f1245e doc: Fix minor mistakes in manpages * ea49cf3 pactree: Fix vertical limbs for --optional Detailed log of new commits: commit bc82ef509b59e44d4b0786591add394644c01bdd Author: Sebastian Jakubiak <jakseb.dev(a)gmail.com> Date: Wed Sep 2 19:41:08 2020 +0200 pactree: Hide dependency satisfiers in more cases Pactree takes care not to print both a dependency and the package to which it resolves if they are equal. Extend (fix?) this to cover versioned dependencies and optional dependencies containing descriptions, so that e.g. `gnupg provides gnupg>=2` and `clang provides clang: for qdoc` will be made more compact. Implementation suggested by Eli Schwartz. Signed-off-by: Sebastian Jakubiak <jakseb.dev(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit 1f1245e3367611e1986df815c2b9169bba114fcb Author: Sebastian Jakubiak <jakseb.dev(a)gmail.com> Date: Tue Aug 4 23:43:58 2020 +0200 doc: Fix minor mistakes in manpages Signed-off-by: Sebastian Jakubiak <jakseb.dev(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit ea49cf33d238511f3a13c21741a318960db041f2 Author: Sebastian Jakubiak <jakseb.dev(a)gmail.com> Date: Tue Aug 4 16:09:48 2020 +0200 pactree: Fix vertical limbs for --optional 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> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Summary of changes: doc/checkupdates.8.txt | 2 +- doc/pacsort.8.txt | 2 +- src/pactree.c | 16 +++++++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0