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 1QvtXf-0003go-Ap for garchives@archives.gentoo.org; Tue, 23 Aug 2011 16:09:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99F2421C1CF; Tue, 23 Aug 2011 16:09:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5407C21C1CF for ; Tue, 23 Aug 2011 16:09:23 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98CEB1B400E for ; Tue, 23 Aug 2011 16:09:22 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 5A60520051; Tue, 23 Aug 2011 16:09:21 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/binutils-config/files: binutils-config-3 X-VCS-Repository: gentoo-x86 X-VCS-Files: binutils-config-3 X-VCS-Directories: sys-devel/binutils-config/files X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20110823160921.5A60520051@flycatcher.gentoo.org> Date: Tue, 23 Aug 2011 16:09:21 +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: edbd0e62bc6a95e3510ef4c3adc08118 vapier 11/08/23 16:09:21 Modified: binutils-config-3 Log: Make sure all the profile specs still work after previous rework. =20 (Portage version: 2.2.0_alpha51/cvs/Linux x86_64) Revision Changes Path 1.4 sys-devel/binutils-config/files/binutils-config-3 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils= -config/files/binutils-config-3?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils= -config/files/binutils-config-3?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils= -config/files/binutils-config-3?r1=3D1.3&r2=3D1.4 Index: binutils-config-3 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutil= s-config-3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- binutils-config-3 12 Aug 2011 20:34:00 -0000 1.3 +++ binutils-config-3 23 Aug 2011 16:09:21 -0000 1.4 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binut= ils-config-3,v 1.3 2011/08/12 20:34:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binut= ils-config-3,v 1.4 2011/08/23 16:09:21 vapier Exp $ =20 # Format of /etc/env.d/binutils/: # config-TARGET: CURRENT=3Dversion for TARGET @@ -389,7 +389,7 @@ -h|--help) usage 0 ;; -V|--version) unset Header - cvsver=3D"$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/= files/binutils-config-3,v 1.3 2011/08/12 20:34:00 vapier Exp $" + cvsver=3D"$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/= files/binutils-config-3,v 1.4 2011/08/23 16:09:21 vapier Exp $" cvsver=3D${cvsver##*binutils-config-} bver=3D${cvsver%%,v *} cvsver=3D${cvsver#* } @@ -453,18 +453,24 @@ if [[ -z ${PROFILE} ]] ; then # User gave us a full HOST-ver x=3D${x##*/} - if [[ ! -f ${ENV_D}/${x} ]] && [[ ! -f ${ENV_D}/config-${x} ]] ; then - # Maybe they just gave us a ver ... - if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then - x=3D${HOST}-${x} - else - eerror "${argv0}: Could not locate '$x' in '${ENV_D}/'!" - exit 1 - fi + if [[ -f ${ENV_D}/${x} ]] ; then + # Valid HOST-ver yeah! PROFILE=3D${x} else - # Maybe they just gave us a target ... pick active profile - PROFILE=3D$(TARGET=3D${x} set_current_profile) + # Not a valid HOST-ver ... + if [[ ! -f ${ENV_D}/config-${x} ]] ; then + # Maybe they just gave us a ver ... + if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then + x=3D${HOST}-${x} + else + eerror "${argv0}: Could not locate '$x' in '${ENV_D}/'!" + exit 1 + fi + PROFILE=3D${x} + else + # Maybe they just gave us a target ... pick active profile + PROFILE=3D$(TARGET=3D${x} set_current_profile) + fi fi fi ;;