diff options
author | Repository QA checks <repo-qa-checks@gentoo.org> | 2018-05-06 13:23:46 +0000 |
---|---|---|
committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2018-05-06 13:23:46 +0000 |
commit | 21e8f9ad02abf95af3bb8bd5f3d503dcf5874575 (patch) | |
tree | 9b726cbfdddf4d84e956676294403c5597cbc2b7 | |
parent | 2018-05-06 12:57:28 UTC (diff) | |
parent | mercurial.eclass: add EHG_CONFIG (bug #608974) (diff) | |
download | gentoo-21e8f9ad02abf95af3bb8bd5f3d503dcf5874575.tar.gz gentoo-21e8f9ad02abf95af3bb8bd5f3d503dcf5874575.tar.bz2 gentoo-21e8f9ad02abf95af3bb8bd5f3d503dcf5874575.zip |
Merge updates from master
-rw-r--r-- | eclass/mercurial.eclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass index ad3102b7590d..9a5bd191c231 100644 --- a/eclass/mercurial.eclass +++ b/eclass/mercurial.eclass @@ -57,15 +57,19 @@ DEPEND="dev-vcs/mercurial" : ${EHG_QUIET:="OFF"} [[ "${EHG_QUIET}" == "ON" ]] && EHG_QUIET_CMD_OPT="--quiet" +# @ECLASS-VARIABLE: EHG_CONFIG +# @DESCRIPTION: +# Extra config option to hand to hg clone/pull + # @ECLASS-VARIABLE: EHG_CLONE_CMD # @DESCRIPTION: # Command used to perform initial repository clone. -[[ -z "${EHG_CLONE_CMD}" ]] && EHG_CLONE_CMD="hg clone ${EHG_QUIET_CMD_OPT} --pull --noupdate" +[[ -z "${EHG_CLONE_CMD}" ]] && EHG_CLONE_CMD="hg clone ${EHG_CONFIG:+--config ${EHG_CONFIG}} ${EHG_QUIET_CMD_OPT} --pull --noupdate" # @ECLASS-VARIABLE: EHG_PULL_CMD # @DESCRIPTION: # Command used to update repository. -[[ -z "${EHG_PULL_CMD}" ]] && EHG_PULL_CMD="hg pull ${EHG_QUIET_CMD_OPT}" +[[ -z "${EHG_PULL_CMD}" ]] && EHG_PULL_CMD="hg pull ${EHG_CONFIG:+--config ${EHG_CONFIG}} ${EHG_QUIET_CMD_OPT}" # @ECLASS-VARIABLE: EHG_OFFLINE # @DESCRIPTION: @@ -134,6 +138,7 @@ mercurial_fetch() { hg clone \ ${EHG_QUIET_CMD_OPT} \ --updaterev="${EHG_REVISION}" \ + ${EHG_CONFIG:+--config ${EHG_CONFIG}} \ "${EHG_STORE_DIR}/${EHG_PROJECT}/${module}" \ "${sourcedir}" || die "hg clone failed" # An exact revision helps a lot for testing purposes, so have some output... |