Arch-projects

Download

arch-projects@lists.archlinux.org

May 2020

1 participants
2 discussions

[arch-projects] [devtools] [PATCH 1/1] make rsync use new-style compression in makepkg.conf
by Christian Hesse 17 Jun '20

17 Jun '20

From: Christian Hesse <mail(a)eworm.de> Our rsync package is no longer built with bundled zlib, so old-style compression is no longer supported. https://www.archlinux.org/news/rsync-compatibility/ Signed-off-by: Christian Hesse <mail(a)eworm.de> --- makepkg-x86_64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index a07756c..3a1384f 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -15,7 +15,7 @@ DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' 'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'rsync::/usr/bin/rsync --no-motd -z %u %o' + 'rsync::/usr/bin/rsync --no-motd -zz %u %o' 'scp::/usr/bin/scp -C %u %o') # Other common tools:

1 1

[arch-projects] [devtools] [PATCH] makerepropkg: do fast cache lookups
by Eli Schwartz 24 May '20

24 May '20

Teach get_pkgfile to call itself in local-only mode and find a cached file no matter what its extension is. Avoids repetitively trying to curl random files, fail with 404 errors, and proceed to discover a cache hit under a different file extension. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- makerepropkg.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/makerepropkg.in b/makerepropkg.in index 62ba5f3..2a8745c 100755 --- a/makerepropkg.in +++ b/makerepropkg.in @@ -57,9 +57,15 @@ parse_buildinfo() { get_pkgfile() { local cdir=${cache_dirs[0]} local pkgfilebase=${1} + local mode=${2} local pkgname=${pkgfilebase%-*-*-*} local pkgfile ext + # try without downloading + if [[ ${mode} != localonly ]] && get_pkgfile "${pkgfilebase}" localonly; then + return 0 + fi + for ext in .zst .xz ''; do pkgfile=${pkgfilebase}.pkg.tar${ext} @@ -72,6 +78,9 @@ get_pkgfile() { for f in "${pkgfile}" "${pkgfile}.sig"; do if [[ ! -f "${cdir}/${f}" ]]; then + if [[ ${mode} = localonly ]]; then + continue 2 + fi msg2 "retrieving '%s'..." "${f}" >&2 curl -Llf -# -o "${cdir}/${f}" "${archiveurl}/${pkgname:0:1}/${pkgname}/${f}" || continue 2 fi -- 2.26.2

1 0