From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6E73013835A for ; Mon, 1 Feb 2021 04:04:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58D57E09C1; Mon, 1 Feb 2021 04:04:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35B92E09C1 for ; Mon, 1 Feb 2021 04:04:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D4E4340E97 for ; Mon, 1 Feb 2021 04:04:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0189C4AF for ; Mon, 1 Feb 2021 04:04:48 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1612058203.4de1432aa1494b7c2459bb7fa740234a6777eac5.mattst88@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-alpha.conf tools/catalyst-auto-amd64.conf tools/catalyst-auto-arm.conf tools/catalyst-auto-arm64.conf tools/catalyst-auto-hppa.conf tools/catalyst-auto-ia64.conf tools/catalyst-auto-ppc.conf tools/catalyst-auto-ppc64le.conf tools/catalyst-auto-qemu-arm.conf tools/catalyst-auto-qemu-riscv.conf tools/catalyst-auto-s390.conf tools/catalyst-auto-s390x.conf tools/catalyst-auto-sparc64.conf tools/catalyst-auto-x86.conf X-VCS-Directories: tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 4de1432aa1494b7c2459bb7fa740234a6777eac5 X-VCS-Branch: master Date: Mon, 1 Feb 2021 04:04:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d92c621b-58a4-4cef-ac10-4ade99d63ae0 X-Archives-Hash: c3d053187d6ed2c11f34c53ad21f6a5b commit: 4de1432aa1494b7c2459bb7fa740234a6777eac5 Author: Matt Turner gentoo org> AuthorDate: Sun Jan 31 00:39:55 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Jan 31 01:56:43 2021 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4de1432a tools: Add RSYNC_OPTS array Signed-off-by: Matt Turner gentoo.org> tools/catalyst-auto-alpha.conf | 5 ++++- tools/catalyst-auto-amd64.conf | 14 +++++++------- tools/catalyst-auto-arm.conf | 5 ++++- tools/catalyst-auto-arm64.conf | 5 ++++- tools/catalyst-auto-hppa.conf | 5 ++++- tools/catalyst-auto-ia64.conf | 5 ++++- tools/catalyst-auto-ppc.conf | 5 ++++- tools/catalyst-auto-ppc64le.conf | 5 ++++- tools/catalyst-auto-qemu-arm.conf | 5 ++++- tools/catalyst-auto-qemu-riscv.conf | 5 ++++- tools/catalyst-auto-s390.conf | 5 ++++- tools/catalyst-auto-s390x.conf | 5 ++++- tools/catalyst-auto-sparc64.conf | 5 ++++- tools/catalyst-auto-x86.conf | 14 +++++++------- 14 files changed, 62 insertions(+), 26 deletions(-) diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf index ebaff6eb..381171b5 100644 --- a/tools/catalyst-auto-alpha.conf +++ b/tools/catalyst-auto-alpha.conf @@ -42,7 +42,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: } post_build() { diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 0ef11f2f..363c80cb 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -74,13 +74,13 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync \ - -e "${SSH_CMD[*]}" \ - -a \ - --omit-dir-times \ - --delay-updates \ - "$@" \ - "${UPLOAD_DEST}" + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + --archive + --omit-dir-times + --delay-updates + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST} } post_build() { diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf index 26fe8156..eaae0399 100644 --- a/tools/catalyst-auto-arm.conf +++ b/tools/catalyst-auto-arm.conf @@ -64,7 +64,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: else echo Would now upload "$@" ls -l $@ diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index 9f457989..1bd94ae9 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -36,7 +36,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: } post_build() { diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf index 8b465421..3b93e4ec 100644 --- a/tools/catalyst-auto-hppa.conf +++ b/tools/catalyst-auto-hppa.conf @@ -42,7 +42,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: } post_build() { diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf index 6c78c8a7..2d87a837 100644 --- a/tools/catalyst-auto-ia64.conf +++ b/tools/catalyst-auto-ia64.conf @@ -35,7 +35,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: } post_build() { diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf index a1286726..615c3f55 100644 --- a/tools/catalyst-auto-ppc.conf +++ b/tools/catalyst-auto-ppc.conf @@ -41,7 +41,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: } post_build() { diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf index 0d54fab9..e2394932 100644 --- a/tools/catalyst-auto-ppc64le.conf +++ b/tools/catalyst-auto-ppc64le.conf @@ -42,7 +42,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: } post_build() { diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf index 1a121997..e6075ec3 100644 --- a/tools/catalyst-auto-qemu-arm.conf +++ b/tools/catalyst-auto-qemu-arm.conf @@ -65,7 +65,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: else echo Would now upload "$@" ls -l $@ diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index b19de76f..dced8eec 100644 --- a/tools/catalyst-auto-qemu-riscv.conf +++ b/tools/catalyst-auto-qemu-riscv.conf @@ -52,7 +52,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: fi } diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index 5716702c..d8a39286 100644 --- a/tools/catalyst-auto-s390.conf +++ b/tools/catalyst-auto-s390.conf @@ -35,7 +35,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: } post_build() { diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf index 3b4fd21c..e8a509d5 100644 --- a/tools/catalyst-auto-s390x.conf +++ b/tools/catalyst-auto-s390x.conf @@ -35,7 +35,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: } post_build() { diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf index bc441b2d..9cfbdcd5 100644 --- a/tools/catalyst-auto-sparc64.conf +++ b/tools/catalyst-auto-sparc64.conf @@ -37,7 +37,10 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org: } post_build() { diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index ef983969..1c809465 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -61,13 +61,13 @@ upload() { -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no ) - rsync \ - -e "${SSH_CMD[*]}" \ - -a \ - --omit-dir-times \ - --delay-updates \ - "$@" \ - "${UPLOAD_DEST}" + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + --archive + --omit-dir-times + --delay-updates + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST} } post_build() {