March 2021 - Pacman-contrib - lists.archlinux.org

[PATCH 0/4] Fixes for (M)erge mode and --sudo
by Denton Liu 28 Jul '21

28 Jul '21

The first two patches are just mailmap changes for incorrect authorship. The third patch is some documentation update. The final patch are some fixes to a bad interaction between (M)erge mode and --sudo. Denton Liu (4): .mailmap: Map Daniel Parks .mailmap: Map Denton Liu pacdiff: update --sudo usages pacdiff: Don't use $SUDO on temporary files .mailmap | 2 ++ doc/pacdiff.8.txt | 3 +++ src/pacdiff.sh.in | 18 +++++++----------- 3 files changed, 12 insertions(+), 11 deletions(-) -- 2.31.0.208.g409f899ff0

2 8

[GIT] branch master updated (19ab4fa -> 62190b1)
by Daniel M. Capella 30 Mar '21

30 Mar '21

This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from 19ab4fa pacdiff: Add option to use sudo/sudoedit to manage files new 35b5992 pacdiff: Fix regression in check for merge status new fea806c .mailmap: Map Daniel Parks new f6bf7f7 .mailmap: Map Denton Liu new 62190b1 pacdiff: update --sudo usages The 4 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: * 62190b1 (HEAD -> master) pacdiff: update --sudo usages * f6bf7f7 .mailmap: Map Denton Liu * fea806c .mailmap: Map Daniel Parks * 35b5992 pacdiff: Fix regression in check for merge status Detailed log of new commits: commit 62190b1bf6c27ab9401c02d27962bf2b422d8ce3 Author: Denton Liu <liu.denton(a)gmail.com> Date: Mon Mar 29 02:02:42 2021 -0700 pacdiff: update --sudo usages In 19ab4fa (pacdiff: Add option to use sudo/sudoedit to manage files, 2021-03-27), the --sudo option was introduced. However, a corresponding entry was not included in the man page. Document it. Also, align the usage text in the program with its friends above. Signed-off-by: Denton Liu <liu.denton(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit f6bf7f77c5c812202ae7ade24c7bf8a0c3f12839 Author: Denton Liu <liu.denton(a)gmail.com> Date: Mon Mar 29 02:02:41 2021 -0700 .mailmap: Map Denton Liu In 94b2a19 (pacdiff: Learn the (M)erge mode, 2021-03-04), 348a296 (pacdiff: Reduce repetition in input loop, 2021-03-04), and b675c92 (pacdiff: Implement die(), 2021-03-04), the patches were erroneously applied with incorrect authorship information. Fix this with a new .mailmap entry. Signed-off-by: Denton Liu <liu.denton(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit fea806c6f048cb961b259cbca057bb964ed50d72 Author: Denton Liu <liu.denton(a)gmail.com> Date: Mon Mar 29 02:02:40 2021 -0700 .mailmap: Map Daniel Parks In 19ab4fa (pacdiff: Add option to use sudo/sudoedit to manage files, 2021-03-27), the patch was erroneously applied with incorrect authorship information. Fix this with a new .mailmap entry. Signed-off-by: Denton Liu <liu.denton(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit 35b59923ebcf7bd6b045ba1e00aab593e140f804 Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Sun Mar 28 03:39:02 2021 -0400 pacdiff: Fix regression in check for merge status Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Summary of changes: .mailmap | 2 ++ doc/pacdiff.8.txt | 3 +++ src/pacdiff.sh.in | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH] pacdiff: Fix regression in check for merge status
by Daniel M. Capella 28 Mar '21

28 Mar '21

Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> --- src/pacdiff.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index 674892b..004203f 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -122,7 +122,8 @@ merge_file() { merged="$($SUDO mktemp "$tempdir"/"$basename.merged.XXX")" tar -xOf "$base_tar" "${file#/}" | $SUDO tee "$base" > /dev/null - if $SUDO $mergeprog "$file" "$base" "$pacfile" | $SUDO tee "$merged" > /dev/null; then + $SUDO $mergeprog "$file" "$base" "$pacfile" | $SUDO tee "$merged" > /dev/null + if [ "${PIPESTATUS[0]}" -ne "1" ]; then msg2 "Merged without conflicts." fi -- 2.31.1

1 0

[PATCH] pacdiff: Add option to use sudo/sudoedit to manage files
by Daniel Parks 28 Mar '21

28 Mar '21

This allows the user to run their diff program as their own user instead of root. The advantage of this approach is that they can use their own configuration for the editor or even use a GUI merge program such as meld. --- src/pacdiff.sh.in | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index c4dbd89..aac88c8 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -28,6 +28,7 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diffprog=${DIFFPROG:-'vim -d'} diffsearchpath=${DIFFSEARCHPATH:-/etc} USE_COLOR='y' +SUDO='' declare -a oldsaves declare -i USE_FIND=0 USE_LOCATE=0 USE_PACDB=0 OUTPUTONLY=0 @@ -50,6 +51,7 @@ Search Options: select one (default: --pacmandb) General Options: -o/--output print files instead of merging them --nocolor remove colors from output + -s/--sudo use sudo to merge/remove files Environment Variables: DIFFPROG override the merge program: (default: 'vim -d') @@ -109,6 +111,8 @@ while [[ -n "$1" ]]; do OUTPUTONLY=1;; --nocolor) USE_COLOR='n';; + -s|--sudo) + SUDO=sudo;; -V|--version) version; exit 0;; -h|--help) @@ -168,25 +172,29 @@ while IFS= read -u 3 -r -d '' pacfile; do msg "%s file found for %s" "$file_type" "$file" if [ ! -f "$file" ]; then warning "$file does not exist" - rm -iv "$pacfile" + $SUDO rm -iv "$pacfile" continue fi if cmp -s "$pacfile" "$file"; then msg2 "Files are identical, removing..." - rm -v "$pacfile" + $SUDO rm -v "$pacfile" else ask "(V)iew, (S)kip, (R)emove %s, (O)verwrite with %s, (Q)uit: [v/s/r/o/q] " "$file_type" "$file_type" while read c; do case $c in q|Q) exit 0;; - r|R) rm -v "$pacfile"; break ;; - o|O) mv -v "$pacfile" "$file"; break ;; + r|R) $SUDO rm -v "$pacfile"; break ;; + o|O) $SUDO mv -v "$pacfile" "$file"; break ;; v|V) - $diffprog "$pacfile" "$file" + if [[ -n "$SUDO" ]]; then + SUDO_EDITOR="$diffprog" sudoedit "$pacfile" "$file" + else + $diffprog "$pacfile" "$file" + fi if cmp -s "$pacfile" "$file"; then msg2 "Files are identical, removing..." - rm -v "$pacfile" + $SUDO rm -v "$pacfile" break fi ask "(V)iew, (S)kip, (R)emove %s, (O)verwrite with %s, (Q)uit: [v/s/r/o/q] " "$file_type" "$file_type"; -- 2.30.1

2 4

[GIT] branch master updated (94b2a19 -> 19ab4fa)
by Daniel M. Capella 28 Mar '21

28 Mar '21

This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from 94b2a19 pacdiff: Learn the (M)erge mode new 19ab4fa pacdiff: Add option to use sudo/sudoedit to manage files 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: * 19ab4fa (HEAD -> master) pacdiff: Add option to use sudo/sudoedit to manage files Detailed log of new commits: commit 19ab4faccc06afccabcb5fe24807f9ba31a7e44e Author: Daniel Parks via pacman-contrib <pacman-contrib(a)lists.archlinux.org> Date: Sat Mar 27 13:22:11 2021 -0500 pacdiff: Add option to use sudo/sudoedit to manage files This allows the user to run their diff program as their own user instead of root. The advantage of this approach is that they can use their own configuration for the editor or even use a GUI merge program such as meld. Signed-off-by: Daniel Parks <danielrparks(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Summary of changes: src/pacdiff.sh.in | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH 0/4] pacdiff: learn (M)erge mode
by Denton Liu 28 Mar '21

28 Mar '21

This series teaches pacdiff to perform 3-way merges on config files. The first commit is a cleanup that should be done regardless of whether the rest of this series is merged. The next two commits are small refactors to make final change more readable. The last patch implements the bulk of the logic. It also includes some comment requests. Denton Liu (4): pacdiff: Reindent awk script pacdiff: Implement die() pacdiff: Reduce repetition in input loop pacdiff: Learn the (M)erge mode doc/pacdiff.8.txt | 9 +++- src/pacdiff.sh.in | 102 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 97 insertions(+), 14 deletions(-) -- 2.29.2.889.g5298b911bd

2 9

[GIT] branch master updated (e092561 -> 94b2a19)
by Daniel M. Capella 28 Mar '21

28 Mar '21

This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from e092561 pacdiff: Reindent awk script new b675c92 pacdiff: Implement die() new 348a296 pacdiff: Reduce repetition in input loop new 94b2a19 pacdiff: Learn the (M)erge mode 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: * 94b2a19 (HEAD -> master) pacdiff: Learn the (M)erge mode * 348a296 pacdiff: Reduce repetition in input loop * b675c92 pacdiff: Implement die() Detailed log of new commits: commit 94b2a194b484441cc555aa069496a40ebb9f97f3 Author: Denton Liu via pacman-contrib <pacman-contrib(a)lists.archlinux.org> Date: Thu Mar 4 03:55:47 2021 -0800 pacdiff: Learn the (M)erge mode Currently, pacdiff only allows users to diff between the current file and the new file. However, the merging of files could be automated by the use of some 3-way merge utility. Teach pacdiff the (M)erge mode which performs a 3-way merge using a given $MERGEPROG (`diff3 -m` by default). The base file is taken from from the second-newest package in the cache. Signed-off-by: Denton Liu <liu.denton(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit 348a29696c41f07b693e29aab9264d1d8d6c17f8 Author: Denton Liu via pacman-contrib <pacman-contrib(a)lists.archlinux.org> Date: Thu Mar 4 03:55:46 2021 -0800 pacdiff: Reduce repetition in input loop The input loop repeats the `ask` code twice. In a future commit, we will be introducing another instance of the `ask` code. This makes it possible to mistakenly make the code to get out of sync. Refactor the loop so that the `ask` code happens once at the top of the loop. This introduces one functional change in the "Invalid answer" case but it also makes it more consistent with the remaining cases. Signed-off-by: Denton Liu <liu.denton(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit b675c9272240bdb1505d528fc6f1bcc0f673fac9 Author: Denton Liu via pacman-contrib <pacman-contrib(a)lists.archlinux.org> Date: Thu Mar 4 03:55:45 2021 -0800 pacdiff: Implement die() In a future commit, we will be making more use of this function. For now, implement it and use it in the one place where it's applicable. Signed-off-by: Denton Liu <liu.denton(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Summary of changes: doc/pacdiff.8.txt | 9 +++-- src/pacdiff.sh.in | 100 ++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 96 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0