From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pvxcx-0004nK-9w for garchives@archives.gentoo.org; Sat, 05 Mar 2011 19:58:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42E971C016; Sat, 5 Mar 2011 19:58:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 025661C016 for ; Sat, 5 Mar 2011 19:58:51 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7CA651B4032 for ; Sat, 5 Mar 2011 19:58:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DB4AC8006A for ; Sat, 5 Mar 2011 19:58:50 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: <8fc3c913ed09072b127679ea7f26ee43ba3f265a.abcd@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: Documentation/maintainers/ X-VCS-Repository: proj/kde X-VCS-Files: Documentation/maintainers/bump_new_revision.sh X-VCS-Directories: Documentation/maintainers/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: 8fc3c913ed09072b127679ea7f26ee43ba3f265a Date: Sat, 5 Mar 2011 19:58:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 5014149111c7b1ae6cac4f583bcb73a6 commit: 8fc3c913ed09072b127679ea7f26ee43ba3f265a Author: abcd gentoo org> AuthorDate: Sat Mar 5 19:58:43 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Sat Mar 5 19:58:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D8fc3c913 [Documentation] Auto-keyword for ~x86-linux and ~amd64-linux --- Documentation/maintainers/bump_new_revision.sh | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentati= on/maintainers/bump_new_revision.sh index d14de0a..1af095e 100755 --- a/Documentation/maintainers/bump_new_revision.sh +++ b/Documentation/maintainers/bump_new_revision.sh @@ -87,18 +87,18 @@ check_cmakelists() { =20 # Updates keywords: # - for stable releases - use latest keywords from tree -# - for snapshot/alpha/beta/rc releases - use fixed ~amd64 and ~x86 keyw= ords +# - for snapshot/alpha/beta/rc releases - use fixed ~amd64, ~x86 and ~{a= md64,x86}-linux keywords # - in either case drop arch to testing update_keywords() { - local MINIMAL_KEYWORDS=3D"~amd64 ~x86" + local MINIMAL_KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" KEYWORDS # Initially strip all keywords ekeyword ^all ${1} > /dev/null if [[ ${BUMP_VERSION} =3D~ ([4-9]+)\.?([0-9]*)\.?([0-9]*) ]]; then local version_major=3D${BASH_REMATCH[1]} local version_minor=3D${BASH_REMATCH[2]} local version_patch=3D${BASH_REMATCH[3]} - if [[ -n {version_patch} ]]; then - if [[ ${version_patch} -lt 50 ]]; then + if [[ -n ${version_patch} ]]; then + if (( version_patch < 50 )); then # Patch version is < 50 - stable release, try to obtain keywords fro= m tree if pushd "$(portageq portdir)/${2}" &> /dev/null; then KEYWORDS=3D$(ls -1r *-4*.ebuild | grep -v ${BUMP_VERSION} | head -n= 1 | xargs sed -ne 's/^KEYWORDS=3D"\(.*\)"/\1/p') @@ -107,7 +107,7 @@ update_keywords() { KEYWORDS=3D${MINIMAL_KEYWORDS} fi popd &> /dev/null - elif [[ ${version_patch} -le 99 ]]; then + elif (( version_patch <=3D 99 )); then # Patch version >=3D 50 and <=3D 99 - snapshot/alpha/beta/rc release= , ~amd64 ~x86 keywords KEYWORDS=3D${MINIMAL_KEYWORDS} fi @@ -184,11 +184,10 @@ SLOT=3D VERSION=3D OPERATION=3D BUMP_VERSION=3D -KEYWORDS=3D SET=3D DIR=3D OUTPUT_DIR=3D -while getopts a:s:v:b:l:p:o:n arg ; do +while getopts a:s:v:b:l:p:o arg ; do case ${arg} in a) OPERATION=3D${OPTARG} ;; s) SLOT=3D${OPTARG} ;; @@ -197,7 +196,6 @@ while getopts a:s:v:b:l:p:o:n arg ; do l) SET=3D"${OPTARG}" ;; p) DIR=3D"${OPTARG}" ;; o) OUTPUT_DIR=3D"${OPTARG}" ;; - n) KEYWORDS=3D"no" ;; *) help ;; ?) help ;; esac