From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CF88313888F for ; Thu, 22 Oct 2015 10:00:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43310E07FA; Thu, 22 Oct 2015 10:00:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D517DE07FA for ; Thu, 22 Oct 2015 10:00:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0DB734050D for ; Thu, 22 Oct 2015 10:00:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD0181377 for ; Thu, 22 Oct 2015 10:00:27 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1445507949.1a3bf718107273f946c0f49f84951d940e91d41c.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: scripts/ X-VCS-Repository: proj/releng X-VCS-Files: scripts/copy_buildsync.sh X-VCS-Directories: scripts/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 1a3bf718107273f946c0f49f84951d940e91d41c X-VCS-Branch: master Date: Thu, 22 Oct 2015 10:00:27 +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-Archives-Salt: 02d0f080-c033-4500-821e-e819e8f2aeca X-Archives-Hash: 295481abe9f91c6135db3e51f28de190 commit: 1a3bf718107273f946c0f49f84951d940e91d41c Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Thu Oct 22 09:59:09 2015 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Thu Oct 22 09:59:09 2015 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1a3bf718 Remove old code, clean-up and cosmetic changes. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> scripts/copy_buildsync.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh index 3ef2e50..69b08c9 100755 --- a/scripts/copy_buildsync.sh +++ b/scripts/copy_buildsync.sh @@ -2,7 +2,6 @@ ARCHES="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86" #alpha amd64 arm hppa ia64 mips ppc s390 sh sparc x86 -#ARCHES="s390" RSYNC_OPTS="-aO --delay-updates" DEBUG= VERBOSE= @@ -15,6 +14,7 @@ OUT_ISO="latest-iso.txt" DEBUGP= VERBOSEP= + [ -n "$DEBUG" ] && DEBUGP=echo [ -n "$DEBUG" ] && RSYNC_OPTS="${RSYNC_OPTS} -n" [ -n "$VERBOSE" ] && RSYNC_OPTS="${RSYNC_OPTS} -v" @@ -29,6 +29,7 @@ for ARCH in $ARCHES; do tmpdir=/release/distfiles/tmp/buildsync/partial/${ARCH} mkdir -p ${tmpdir} 2>/dev/null + # Copying if [ -d "${indir}" ]; then for i in $(find ${indir} -type f | grep -- '-20[0123][0-9]\{5\}' | sed -e 's:^.*-\(20[^.]\+\).*$:\1:' | sort -ur); do @@ -78,9 +79,11 @@ for ARCH in $ARCHES; do fi if [ -n "${stage3_list}" ]; then echo -e "${header}" >"${OUT_STAGE3}" + # In the new variant preserve code there is a better way to do this #echo -e "${stage3_list}" |awk '{print $3}' |grep "$latest_stage3_date" >>${OUT_STAGE3} rm -f current-stage3 + # The "latest stage3" concept doesn't apply to the arm/hppa/s390/sh variants # that are pushed on different days of the week. # Disable it for amd64/x86 as well as any failures cause confusion to users @@ -89,7 +92,7 @@ for ARCH in $ARCHES; do fi fi - # new variant preserve code + # New variant preserve code variants=$(find 20* \( -iname '*.iso' -o -iname "*${EXTENSIONS}" \) -printf '%f\n' | sed -e 's,-20[012][0-9]\{5\}.*,,g' -r | sort | uniq) echo -n '' >"${tmpdir}"/.keep.${ARCH}.txt for v in $variants ; do @@ -108,15 +111,13 @@ for ARCH in $ARCHES; do ln -sf "${variant_path%/*}" "current-$v" echo "${variant_path}" | sed -e 's,/.*,,g' -e 's,^,/,g' -e 's,$,$,g' >>"${tmpdir}"/.keep.${ARCH}.txt done - #echo "$date_variant" \ - #| sort | uniq | sed -e 's,^,/,g' -e 's,$,$,g' >"${tmpdir}"/.keep.${ARCH}.txt # ================================================================ # Cleanup if [ $fail -eq 0 ]; then + # Clean up all but latest 4 from mirror dir cd "${outdir}" - #echo regex "/${latest_iso_date}\$|/${latest_stage3_date}\$" for i in $(find -regextype posix-basic -mindepth 1 -maxdepth 1 -type d -regex '.*20[012][0-9]\{5\}.*' \ | sed -e 's:^.*-\(20[^.]\+\).*$:\1:' \ | sort -ur \