diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-21 18:00:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-21 18:00:10 +0100 |
| commit | 265dbe5dbc14c199299496c6db8fce3f76647015 (patch) | |
| tree | ab18b5617d138f6684566b619405090989d55a2c /eclass/git-r3.eclass | |
| parent | 586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff) | |
gentoo resync : 21.09.2018
Diffstat (limited to 'eclass/git-r3.eclass')
| -rw-r--r-- | eclass/git-r3.eclass | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index 48fac96ee358..a1ad0d238dc9 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -122,8 +122,6 @@ fi # URIs are completely unsecured and their use (even if only as # a fallback) renders the ebuild completely vulnerable to MITM attacks. # -# It can be overridden via env using ${PN}_LIVE_REPO variable. -# # Can be a whitespace-separated list or an array. # # Example: @@ -152,8 +150,6 @@ fi # @DESCRIPTION: # The branch name to check out. If unset, the upstream default (HEAD) # will be used. -# -# It can be overridden via env using ${PN}_LIVE_BRANCH variable. # @ECLASS-VARIABLE: EGIT_COMMIT # @DEFAULT_UNSET @@ -162,8 +158,6 @@ fi # commit from the branch will be used. Note that if set to a commit # not on HEAD branch, EGIT_BRANCH needs to be set to a branch on which # the commit is available. -# -# It can be overridden via env using ${PN}_LIVE_COMMIT variable. # @ECLASS-VARIABLE: EGIT_COMMIT_DATE # @DEFAULT_UNSET @@ -178,8 +172,6 @@ fi # (assuming that merges are done correctly). In other words, each merge # will be considered alike a single commit with date corresponding # to the merge commit date. -# -# It can be overridden via env using ${PN}_LIVE_COMMIT_DATE variable. # @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR # @DESCRIPTION: @@ -262,6 +254,7 @@ _git-r3_env_setup() { esc_pn=${PN//[-+]/_} [[ ${esc_pn} == [0-9]* ]] && esc_pn=_${esc_pn} + # note: deprecated, use EGIT_OVERRIDE_* instead livevar=${esc_pn}_LIVE_REPO EGIT_REPO_URI=${!livevar-${EGIT_REPO_URI}} [[ ${!livevar} ]] \ @@ -586,6 +579,8 @@ git-r3_fetch() { local -x GIT_DIR _git-r3_set_gitdir "${repos[0]}" + einfo "Repository id: ${GIT_DIR##*/}" + # prepend the local mirror if applicable if [[ ${EGIT_MIRROR_URI} ]]; then repos=( @@ -618,10 +613,11 @@ git-r3_fetch() { COMMIT_DATE:commit_date ) - local localvar livevar live_warn= + local localvar livevar live_warn= override_vars=() for localvar in "${varmap[@]}"; do livevar=EGIT_OVERRIDE_${localvar%:*}_${override_name} localvar=${localvar#*:} + override_vars+=( "${livevar}" ) if [[ -n ${!livevar} ]]; then [[ ${localvar} == repos ]] && repos=() @@ -633,6 +629,13 @@ git-r3_fetch() { if [[ ${live_warn} ]]; then ewarn "No support will be provided." + else + einfo "To override fetched repository properties, use:" + local x + for x in "${override_vars[@]}"; do + einfo " ${x}" + done + einfo fi fi |