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 0D444138334 for ; Mon, 9 Dec 2019 09:30:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DD21E081B; Mon, 9 Dec 2019 09:30:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 32669E081B for ; Mon, 9 Dec 2019 09:30:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0F5A034D89E for ; Mon, 9 Dec 2019 09:30:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C5928A7 for ; Mon, 9 Dec 2019 09:30:10 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1575883730.fa0f8720e168c95bcd6a8bd57d5abf09c488fd32.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: misc/ X-VCS-Repository: proj/portage X-VCS-Files: misc/emerge-delta-webrsync X-VCS-Directories: misc/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fa0f8720e168c95bcd6a8bd57d5abf09c488fd32 X-VCS-Branch: master Date: Mon, 9 Dec 2019 09:30:10 +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: 0ea442af-9d98-43d1-a765-7dc85ee5ec00 X-Archives-Hash: 95157a4886b3cf19995f2f51bfe8366d commit: fa0f8720e168c95bcd6a8bd57d5abf09c488fd32 Author: Zac Medico gentoo org> AuthorDate: Mon Dec 9 09:26:55 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Dec 9 09:28:50 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=fa0f8720 emerge-delta-webrsync: handle gentoo-YYYYMMDD directory name Bug: https://bugs.gentoo.org/693454 Signed-off-by: Zac Medico gentoo.org> misc/emerge-delta-webrsync | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync index c5f6fbbd3..cda5a9229 100755 --- a/misc/emerge-delta-webrsync +++ b/misc/emerge-delta-webrsync @@ -332,7 +332,7 @@ check_file_signature() { get_snapshot_timestamp() { local file="$1" - do_tar "${file}" --to-stdout -xf - portage/metadata/timestamp.x | cut -f 1 -d " " + do_tar "${file}" --to-stdout -f - --wildcards -x '*/metadata/timestamp.x' | cut -f 1 -d " " } sync_local() { @@ -361,23 +361,22 @@ sync_local() { return 1 fi else - if ! do_tar "${file}" xf - -C "${TMPDIR}" ; then + if ! do_tar "${file}" -x --strip-components=1 -f - -C "${TMPDIR}" ; then eecho "tar failed to extract the image. tarball is corrupt? (${file})" - rm -fr "${TMPDIR}"/portage + rm -fr "${TMPDIR}" return 1 fi local rsync_opts="${PORTAGE_RSYNC_OPTS} ${PORTAGE_RSYNC_EXTRA_OPTS}" - if chown ${ownership} "${TMPDIR}"/portage > /dev/null 2>&1; then - chown -R ${ownership} "${TMPDIR}"/portage + if chown ${ownership} "${TMPDIR}" > /dev/null 2>&1; then + chown -R ${ownership} "${TMPDIR}" rsync_opts+=" --owner --group" fi - cd "${TMPDIR}"/portage rsync ${rsync_opts} . "${repo_location%%/}" cd "${DISTDIR}" __vecho "Cleaning up ..." - rm -fr "${TMPDIR}"/portage + rm -fr "${TMPDIR}" fi if has metadata-transfer ${FEATURES} ; then