July 2018 - Pacman-contrib - lists.archlinux.org

[PATCH] Set vim 'commentstring' option in ftplugin/PKGBUILD.vim.
by Antony Lee 06 Aug '18

06 Aug '18

>From 05c11d3e1a7fc0079fca4ccf3694a88a9d2d0146 Mon Sep 17 00:00:00 2001 From: Antony Lee <anntzer.lee(a)gmail.com> Date: Mon, 16 Jul 2018 12:02:56 +0200 Subject: [PATCH] Set vim 'commentstring' option in ftplugin/PKGBUILD.vim. This option enables, in particular, commenting plugings (e.g. https://github.com/tomtom/tcomment_vim) to know how toggle comments on PKGBUILDs. See FS#59321. Signed-off-by: Antony Lee <anntzer.lee(a)gmail.com> --- src/Makefile.am | 7 ++++++- src/vim/ftplugin/PKGBUILD.vim | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/vim/ftplugin/PKGBUILD.vim diff --git a/src/Makefile.am b/src/Makefile.am index 792da70..e756899 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,11 +14,15 @@ bin_SCRIPTS = \ bin_PROGRAMS = pacsort pactree vim_ftdetect_dir = $(vim_dir)/ftdetect +vim_ftplugin_dir = $(vim_dir)/ftplugin vim_syntax_dir = $(vim_dir)/syntax vim_ftdetect__DATA = \ vim/ftdetect/PKGBUILD.vim +vim_ftplugin__DATA = \ + vim/ftplugin/PKGBUILD.vim + vim_syntax__DATA = \ vim/syntax/PKGBUILD.vim @@ -62,7 +66,8 @@ EXTRA_DIST = \ rankmirrors.sh.in \ updpkgsums.sh.in \ vim/syntax/PKGBUILD.vim \ - vim/ftdetect/PKGBUILD.vim + vim/ftdetect/PKGBUILD.vim \ + vim/ftplugin/PKGBUILD.vim # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(OURSCRIPTS) $(OURFILES) *.tmp diff --git a/src/vim/ftplugin/PKGBUILD.vim b/src/vim/ftplugin/PKGBUILD.vim new file mode 100644 index 0000000..cbb46a9 --- /dev/null +++ b/src/vim/ftplugin/PKGBUILD.vim @@ -0,0 +1,4 @@ +if exists("b:did_ftplugin") | finish | endif +let b:did_ftplugin = 1 + +setlocal commentstring=#\ %s -- 2.18.0

2 2

[pacman-contrib] [PATCH 1/2] pacscripts: use filename directly instead of parsing pacman.conf
by Eli Schwartz 15 Jul '18

15 Jul '18

pacman-conf may return multiple cachedirs, in which case we treat it as one cachedir containing newline characters, which is certainly wrong in every case. However, pacman -Sddp already returns a filepath when the package is cached. This also properly handles packages already available in a secondary cache directory without looping through each one and checking for ourselves, where it is located. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- src/pacscripts.sh.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pacscripts.sh.in b/src/pacscripts.sh.in index 17e2625..3f11d3d 100644 --- a/src/pacscripts.sh.in +++ b/src/pacscripts.sh.in @@ -52,9 +52,7 @@ if ! DBPath="$(pacman-conf DBPath)"; then error "unable to read @sysconfdir@/pacman.conf" exit 1 fi -CacheDir="$(pacman-conf CacheDir)" pac_db="${DBPath:-@localstatedir@/lib/pacman}/local" -pac_cache="${CacheDir:-@localstatedir@/cache/pacman/pkg}" version() { printf "%s %s\n" "$myname" "$myver" @@ -113,15 +111,15 @@ print_scriptlet() { return 1 fi url=$(pacman -Sddp $1) - filename=$(basename $url) - if [ ! -f "$pac_cache/$filename" ]; then + if [[ $url != file://* ]]; then if ! spacman -Sddw --noconfirm $1 >&2; then error "Failed to download $1" return 1 fi echo >&2 + url=$(pacman -Sddp $1) fi - print_pkg "$pac_cache/$filename" + print_pkg "${url#file://}" return } -- 2.18.0

1 1

[PATCH] rankmirrors: add --max-time option
by Sami Kerola 06 Jul '18

06 Jul '18

When testing all known mirrors, and knowing you have fairly ok connectivity, it's nice to have ability to define more aggressive timeout, such as 0.1 This way finding a small number of best mirrors will take a little bit less time in total. Signed-off-by: Sami Kerola <kerolasa(a)iki.fi> --- src/rankmirrors.sh.in | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/rankmirrors.sh.in b/src/rankmirrors.sh.in index 7f518c0..faa4074 100644 --- a/src/rankmirrors.sh.in +++ b/src/rankmirrors.sh.in @@ -34,13 +34,14 @@ usage() { echo "Usage: ${myname} [options] MIRRORFILE | URL" echo echo "Options:" - echo " --version show program's version number and exit" - echo " -h, --help show this help message and exit" - echo " -n NUM number of servers to output, 0 for all" - echo " -t, --times only output mirrors and their response times" - echo " -u, --url test a specific URL" - echo " -v, --verbose be verbose in output" - echo " -r, --repo specify a repository name instead of guessing" + echo " --version show program's version number and exit" + echo " -h, --help show this help message and exit" + echo " -n NUM number of servers to output, 0 for all" + echo " -m, --max-time NUM specify a ranking operation timeout, can be desimal number" + echo " -t, --times only output mirrors and their response times" + echo " -u, --url test a specific URL" + echo " -v, --verbose be verbose in output" + echo " -r, --repo specify a repository name instead of guessing" exit 0 } @@ -61,7 +62,7 @@ err() { # gettime fetchurl (e.g gettime http://foo.com/core/os/i686/core.db.tar.gz) # returns the fetching time, or timeout, or unreachable gettime() { - IFS=' ' output=( $(curl -s -m 10 -w "%{time_total} %{http_code}" "$1" -o/dev/null) ) + IFS=' ' output=( $(curl -s -m $MAX_TIME -w "%{time_total} %{http_code}" "$1" -o/dev/null) ) (( $? == 28 )) && echo timeout && return (( ${output[1]} >= 400 || ! ${output[1]} )) && echo unreachable && return echo "${output[0]}" @@ -128,6 +129,10 @@ while [[ $1 ]]; do case "${1:2}" in help) usage ;; version) version ;; + max-time) + [[ $2 ]] || err "Must specify number."; + MAX_TIME="$2" + shift 2;; times) TIMESONLY=1 ; shift ;; verbose) VERBOSE=1 ; shift ;; url) @@ -153,6 +158,10 @@ while [[ $1 ]]; do for ((i=1 ; i<${#1}; i++)); do case ${1:$i:1} in h) usage ;; + m) + [[ $2 ]] || err "Must specify number."; + MAX_TIME="$2" + shift 2;; t) TIMESONLY=1 ;; v) VERBOSE=1 ;; u) @@ -185,6 +194,7 @@ done # Some sanity checks [[ $NUM ]] || NUM=0 +[[ $MAX_TIME ]] || MAX_TIME=10 [[ $FILE && $CHECKURL ]] && err "Cannot specify a URL and mirrorfile." [[ $FILE || $CHECKURL || $STDIN ]] || err "Must specify URL, mirrorfile, or stdin." -- 2.17.1

3 2

[GIT] branch master updated (1603b07 -> 2197352)
by Johannes Löthberg 06 Jul '18

06 Jul '18

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from 1603b07 paccache: add man page new 60313f7 pactree: Use full dep string when finding dependencies new 2197352 rankmirrors: add --max-time option The 2 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: * 2197352 (HEAD -> master) rankmirrors: add --max-time option * 60313f7 pactree: Use full dep string when finding dependencies Detailed log of new commits: commit 2197352aca3b3554e891fe4397bc30649f5c6cbd Author: Sami Kerola <kerolasa(a)iki.fi> Date: Fri Jun 8 22:05:25 2018 +0100 rankmirrors: add --max-time option When testing all known mirrors, and knowing you have fairly ok connectivity, it's nice to have ability to define more aggressive timeout, such as 0.1 This way finding a small number of best mirrors will take a little bit less time in total. Signed-off-by: Sami Kerola <kerolasa(a)iki.fi> Message-Id: <20180608210525.5545-1-kerolasa(a)iki.fi> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit 60313f752e8f26839368a36ffced48a7624c5b10 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Thu Jun 21 23:08:44 2018 +0200 pactree: Use full dep string when finding dependencies Otherwise we don't use the version requirements, leading us to sometimes get the wrong results for lib32 .so deps. Fixes FS#59072. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Message-Id: <20180621210844.17452-1-johannes(a)kyriasis.com> Summary of changes: src/pactree.c | 19 ++++++++----------- src/rankmirrors.sh.in | 26 ++++++++++++++++++-------- 2 files changed, 26 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0