Pacman-contrib

Download

pacman-contrib@lists.archlinux.org

June 2021

2 discussions

[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

[pacman-contrib] [PATCH] updpkgsums: don't try to add nonexistent checksums
by Eli Schwartz 28 Jul '21

28 Jul '21

In the event there are no sources, there won't be sums either. awk won't find any to remove and replace inline, so it tries to print "" at the end of the file, and merely adds superfluous newlines. Abort early instead, since updpkgsums cannot be expected to process such a file. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- src/updpkgsums.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/updpkgsums.sh.in b/src/updpkgsums.sh.in index 41965f5..e5dbd2b 100644 --- a/src/updpkgsums.sh.in +++ b/src/updpkgsums.sh.in @@ -99,6 +99,11 @@ newbuildfile=$(mktemp "${TMPDIR:-/tmp}/updpkgsums.XXXXXX") trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT sumtypes=$(IFS='|'; echo "${known_hash_algos[*]}") newsums=$(makepkg -g -p "$buildfile" "${MAKEPKG_OPTS[@]}") || die 'Failed to generate new checksums' + +if [[ -z $newsums ]]; then + die "$buildfile does not contain sources to update" +fi + awk -v sumtypes="$sumtypes" -v newsums="$newsums" ' $0 ~"^[[:blank:]]*(" sumtypes ")sums(_[^=]+)?=", $0 ~ "\\)[[:blank:]]*(#.*)?$" { if (!w) { -- 2.31.1

2 1