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 1R76EO-0005O4-MJ for garchives@archives.gentoo.org; Fri, 23 Sep 2011 13:55:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 855CD21C165; Fri, 23 Sep 2011 13:55:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5899821C165 for ; Fri, 23 Sep 2011 13:55:49 +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 C34941B4009 for ; Fri, 23 Sep 2011 13:55:48 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 6FF9D20035; Fri, 23 Sep 2011 13:55:47 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: git-2.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: git-2.eclass X-VCS-Directories: eclass X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Message-Id: <20110923135547.6FF9D20035@flycatcher.gentoo.org> Date: Fri, 23 Sep 2011 13:55:47 +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: 9baf830cec1aa8f6e004c051a4fa9899 mgorny 11/09/23 13:55:47 Modified: git-2.eclass Log: Replace variable 'eval's with ${!foo}. Revision Changes Path 1.15 eclass/git-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-2.eclas= s?rev=3D1.15&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-2.eclas= s?rev=3D1.15&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-2.eclas= s?r1=3D1.14&r2=3D1.15 Index: git-2.eclass =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/eclass/git-2.eclass,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- git-2.eclass 22 Aug 2011 04:46:31 -0000 1.14 +++ git-2.eclass 23 Sep 2011 13:55:47 -0000 1.15 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.14 2011/08/22= 04:46:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.15 2011/09/23= 13:55:47 mgorny Exp $ =20 # @ECLASS: git-2.eclass # @MAINTAINER: @@ -127,7 +127,8 @@ git-2_init_variables() { debug-print-function ${FUNCNAME} "$@" =20 - local x + local esc_pn liverepo livebranch livecommit + esc_pn=3D${PN//[-+]/_} =20 : ${EGIT_SOURCEDIR=3D"${S}"} =20 @@ -139,19 +140,19 @@ =20 : ${EGIT_MASTER:=3Dmaster} =20 - eval x=3D"\$${PN//[-+]/_}_LIVE_REPO" - EGIT_REPO_URI=3D${x:-${EGIT_REPO_URI}} + liverepo=3D${esc_pn}_LIVE_REPO + EGIT_REPO_URI=3D${!liverepo:-${EGIT_REPO_URI}} [[ -z ${EGIT_REPO_URI} ]] && die "EGIT_REPO_URI must have some value" =20 : ${EVCS_OFFLINE:=3D} =20 - eval x=3D"\$${PN//[-+]/_}_LIVE_BRANCH" - [[ -n ${x} ]] && ewarn "QA: using \"${PN//[-+]/_}_LIVE_BRANCH\" variabl= e, you won't get any support" - EGIT_BRANCH=3D${x:-${EGIT_BRANCH:-${EGIT_MASTER}}} - - eval x=3D"\$${PN//[-+]/_}_LIVE_COMMIT" - [[ -n ${x} ]] && ewarn "QA: using \"${PN//[-+]/_}_LIVE_COMMIT\" variabl= e, you won't get any support" - EGIT_COMMIT=3D${x:-${EGIT_COMMIT:-${EGIT_BRANCH}}} + livebranch=3D${esc_pn}_LIVE_BRANCH + [[ -n ${!livebranch} ]] && ewarn "QA: using \"${esc_pn}_LIVE_BRANCH\" v= ariable, you won't get any support" + EGIT_BRANCH=3D${!livebranch:-${EGIT_BRANCH:-${EGIT_MASTER}}} + + livecommit=3D${esc_pn}_LIVE_COMMIT + [[ -n ${!livecommit} ]] && ewarn "QA: using \"${esc_pn}_LIVE_COMMIT\" v= ariable, you won't get any support" + EGIT_COMMIT=3D${!livecommit:-${EGIT_COMMIT:-${EGIT_BRANCH}}} =20 : ${EGIT_REPACK:=3D} =20