Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Thu, 26 May 2016 11:49:51
Message-Id: 1464263378.50d60ffdc974d97a9cc58d44c9d31e26bcdbbaec.mgorny@gentoo
1 commit: 50d60ffdc974d97a9cc58d44c9d31e26bcdbbaec
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 26 11:48:38 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu May 26 11:49:38 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d60ffd
7
8 git-r3.eclass: Allow *_LIVE* to unset ebuild-defined vars
9
10 eclass/git-r3.eclass | 6 +++---
11 1 file changed, 3 insertions(+), 3 deletions(-)
12
13 diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
14 index d202e33..b7a9333 100644
15 --- a/eclass/git-r3.eclass
16 +++ b/eclass/git-r3.eclass
17 @@ -240,17 +240,17 @@ _git-r3_env_setup() {
18 esc_pn=${PN//[-+]/_}
19
20 livevar=${esc_pn}_LIVE_REPO
21 - EGIT_REPO_URI=${!livevar:-${EGIT_REPO_URI}}
22 + EGIT_REPO_URI=${!livevar-${EGIT_REPO_URI}}
23 [[ ${!livevar} ]] \
24 && ewarn "Using ${livevar}, no support will be provided"
25
26 livevar=${esc_pn}_LIVE_BRANCH
27 - EGIT_BRANCH=${!livevar:-${EGIT_BRANCH}}
28 + EGIT_BRANCH=${!livevar-${EGIT_BRANCH}}
29 [[ ${!livevar} ]] \
30 && ewarn "Using ${livevar}, no support will be provided"
31
32 livevar=${esc_pn}_LIVE_COMMIT
33 - EGIT_COMMIT=${!livevar:-${EGIT_COMMIT}}
34 + EGIT_COMMIT=${!livevar-${EGIT_COMMIT}}
35 [[ ${!livevar} ]] \
36 && ewarn "Using ${livevar}, no support will be provided"